电子信息牌增加管理员头像字段

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

@@ -104,6 +104,7 @@ 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 safeUser = String.valueOf(map.getOrDefault("safeUserNameAdminPhone", ""));
         if (StringUtils.isNotEmpty(safeUser) && StringUtils.isNotNull(safeUser)) {
             String splitStr[] = safeUser.split(",");

zd-modules/zd-base/src/main/java/com/zd/base/app/domain/board/LabXxpSubjectVo.java

@@ -43,6 +43,9 @@ public class LabXxpSubjectVo {
     @ApiModelProperty(value = "楼栋+房间号")
     private String subjectName;
 
+    @ApiModelProperty("用户头像")
+    private String avatar;
+
     @ApiModelProperty("进入检查项")
     private List<Map<String,String>> inCheck;
 
@@ -210,4 +213,12 @@ public class LabXxpSubjectVo {
     public void setSubjectName(String subjectName) {
         this.subjectName = subjectName;
     }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
 }

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

@@ -1239,6 +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 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