Parcourir la source

fix(修改名称映射)

gengyang il y a 5 ans
Parent
commit
4873aef442

+ 3 - 0
src/main/java/com/mokamrp/privates/mapper/WorkContactRoomMapper.xml

@@ -51,10 +51,13 @@
         a.join_time,
         a.join_time,
         a.out_time,
         a.out_time,
         b.`name` as nick_name,
         b.`name` as nick_name,
+        c.`name` as employee_name,
+        c.`avatar` as employee_avatar,
         b.avatar
         b.avatar
         FROM
         FROM
         mc_work_contact_room AS a
         mc_work_contact_room AS a
         LEFT JOIN mc_work_contact AS b ON b.id = a.contact_id
         LEFT JOIN mc_work_contact AS b ON b.id = a.contact_id
+        LEFT JOIN mc_work_employee AS c ON c.id = a.employee_id
         <where>
         <where>
             ${ew.sqlSegment}
             ${ew.sqlSegment}
         </where>
         </where>

+ 23 - 5
src/main/java/com/mokamrp/privates/mapper/vo/WorkContactRoomByRoomIdVo.java

@@ -20,6 +20,24 @@ public class WorkContactRoomByRoomIdVo {
     private Integer type;
     private Integer type;
     private Integer status;
     private Integer status;
     private String joinTime;
     private String joinTime;
+    private String employeeName;
+    private String employeeAvatar;
+
+    public String getEmployeeName() {
+        return employeeName;
+    }
+
+    public void setEmployeeName(String employeeName) {
+        this.employeeName = employeeName;
+    }
+
+    public String getEmployeeAvatar() {
+        return employeeAvatar;
+    }
+
+    public void setEmployeeAvatar(String employeeAvatar) {
+        this.employeeAvatar = employeeAvatar;
+    }
 
 
     public String getWxUserId() {
     public String getWxUserId() {
         return wxUserId;
         return wxUserId;
@@ -78,7 +96,7 @@ public class WorkContactRoomByRoomIdVo {
     }
     }
 
 
     private String outTime;
     private String outTime;
-    private String nick_name;
+    private String nickName;
     private String avatar;
     private String avatar;
 
 
     public Integer getId() {
     public Integer getId() {
@@ -113,12 +131,12 @@ public class WorkContactRoomByRoomIdVo {
         this.status = status;
         this.status = status;
     }
     }
 
 
-    public String getNick_name() {
-        return nick_name;
+    public String getNickName() {
+        return nickName;
     }
     }
 
 
-    public void setNick_name(String nick_name) {
-        this.nick_name = nick_name;
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
     }
     }
 
 
     public String getAvatar() {
     public String getAvatar() {