merge

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ImGroupMemberDto.java

@@ -7,7 +7,17 @@ public class ImGroupMemberDto extends ImGroupMember {
 
 	private SysUser user = new SysUser();
 
-	public SysUser getUser() {
+    private String type;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public SysUser getUser() {
 		return user;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/EFriendRoleType.java

@@ -10,7 +10,7 @@ public enum EFriendRoleType implements BaseEnum<Integer, EFriendRoleType> {
     SCHOOL_LEADER(3,"分管领导"),
     SCHOOL_TEACHER(4,"负责老师"),
     ORCHESTRA_MANAGER(5,"乐团主管"),
-    MAINTENANCE_TECHNICIAN(6,"乐团主管"),
+    MAINTENANCE_TECHNICIAN(6,"维护技师"),
     ORCHESTRA_TEACHER(7,"指导老师"),
     STUDENT(8,"学生"),
 
@@ -39,6 +39,16 @@ public enum EFriendRoleType implements BaseEnum<Integer, EFriendRoleType> {
             case "指导老师":
                 return ORCHESTRA_TEACHER;
 
+            case "校长":
+                return SCHOOLMASTER;
+            case "乐团领队":
+                return ORCHESTRA_LEADER;
+            case "分管领导":
+                return SCHOOL_LEADER;
+            case "负责老师":
+                return SCHOOL_TEACHER;
+            case "维护技师":
+                return SCHOOL_TEACHER;
             default:
                 return STUDENT;
         }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/ImGroupWrapper.java

@@ -23,6 +23,9 @@ public class ImGroupWrapper {
 
         @ApiModelProperty("当前用户ID")
         private Integer userId;
+
+        @ApiModelProperty("用户状态 false ：查询未锁定")
+        private Boolean lockFlag;
     }
 
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupServiceImpl.java

@@ -16,6 +16,7 @@ import com.ym.mec.biz.dal.dto.NameDto;
 import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.dal.entity.ImGroup;
 import com.ym.mec.biz.dal.entity.ImGroupMember;
+import com.ym.mec.biz.dal.enums.EFriendRoleType;
 import com.ym.mec.biz.dal.enums.school.ESchoolStaffType;
 import com.ym.mec.biz.dal.wrapper.ImGroupWrapper;
 import com.ym.mec.biz.service.*;
@@ -182,7 +183,12 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 
     @Override
     public List<ImGroupMemberDto> queryMemberById(String imGroupId) {
-        return imGroupDao.queryMemberById(imGroupId);
+        List<ImGroupMemberDto> imGroupMemberDtos = imGroupDao.queryMemberById(imGroupId);
+
+        for (ImGroupMemberDto imGroupMemberDto : imGroupMemberDtos) {
+            imGroupMemberDto.setType(EFriendRoleType.getByName(imGroupMemberDto.getRoleType()).name());
+        }
+        return imGroupMemberDtos;
     }
 
     @Override

mec-biz/src/main/resources/config/mybatis/ImUserFriendMapper.xml

@@ -184,5 +184,8 @@
         <if test="param.roleType != null and param.roleType != ''">
             and iuf.role_type_ = #{param.roleType}
         </if>
+        <if test="param.lockFlag != null and !param.lockFlag">
+            and u.lock_flag_ = 0
+        </if>
     </select>
 </mapper>