电子信息牌增加管理员头像路径bug修改

zd-modules/zd-base/src/main/java/com/zd/base/app/controller/LabBoardApi.java

@@ -104,7 +104,11 @@ public class LabBoardApi {
         vo.setTypeName(String.valueOf(map.getOrDefault("typeName", "")));
         vo.setQrCodeUrl(String.valueOf(map.getOrDefault("qrCode", "")));
         vo.setDeptName(String.valueOf(map.getOrDefault("deptName", "")));
-        vo.setAvatar(String.valueOf(map.getOrDefault("avatar", "")));
+        String url = String.valueOf(map.getOrDefault("avatar", ""));
+        if(StringUtils.isNotEmpty(url) && url.length()>0){
+            url = fileConfigUtils.getFileDomainAdmin()+String.valueOf(map.getOrDefault("avatar", ""));
+        }
+        vo.setAvatar(url);
         String safeUser = String.valueOf(map.getOrDefault("safeUserNameAdminPhone", ""));
         if (StringUtils.isNotEmpty(safeUser) && StringUtils.isNotNull(safeUser)) {
             String splitStr[] = safeUser.split(",");

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSubjectMapper.xml

@@ -1239,7 +1239,7 @@
                su.nick_name                                                   as          adminName,
                su.phonenumber                                                 as          adminPhone,
                sd.dept_name                                                   as          deptName,
-               (select avatar from sys_user where admin_id=t.safe_user_id)	  as           avatar,
+               (select avatar from sys_user where user_id=t.admin_id)	      as           avatar,
                (select GROUP_CONCAT(concat(nick_name,'@',phonenumber)) from sys_user where find_in_set(user_id,
         t.safe_user_id)) safeUserNameAdminPhone,t.check_out, t.check_in,inspect_check_in
         from lab_subject t