Merge remote-tracking branch 'origin/feature/0427-school' into feature/0427-school

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ImGroupDao.java

@@ -11,30 +11,32 @@ import java.util.List;
 
 public interface ImGroupDao extends BaseDAO<String, ImGroup> {
 
-	ImGroup getLocked(String imGroupId);
-
-	/**
-	 * 查询用户所在的群列表
-	 * @param userId
-	 * @param search
-	 * @return
-	 */
-	List<ImGroup> queryByUserId(@Param("userId") Integer userId,
-								@Param("search") String search,
-								@Param("groupType") String groupType);
-
-	/**
-	 * 查询群成员列表
-	 * @param imGroupId
-	 * @return
-	 */
-	List<ImGroupMemberDto> queryMemberById(String imGroupId);
-
-	ImGroupMemberDto queryMember(@Param("imGroupId") String imGroupId, @Param("userId") Integer userId);
+    ImGroup getLocked(String imGroupId);
+
+    /**
+     * 查询用户所在的群列表
+     *
+     * @param userId
+     * @param search
+     * @return
+     */
+    List<ImGroup> queryByUserId(@Param("userId") Integer userId,
+                                @Param("search") String search,
+                                @Param("groupType") String groupType);
+
+    /**
+     * 查询群成员列表
+     *
+     * @param imGroupId
+     * @return
+     */
+    List<ImGroupMemberDto> queryMemberById(String imGroupId);
+
+    ImGroupMemberDto queryMember(@Param("imGroupId") String imGroupId, @Param("userId") Integer userId);
 
     int updateNickname(@Param("userId") Integer userId, @Param("nickName") String nickName);
 
-	int updateUserFriendNickname(@Param("userId") Integer userId, @Param("nickName") String nickName);
+    int updateUserFriendNickname(@Param("userId") Integer userId, @Param("nickName") String nickName);
 
     void updateMemberNum();
 
@@ -57,4 +59,6 @@ public interface ImGroupDao extends BaseDAO<String, ImGroup> {
     void addMemberNum(@Param("imGroupIds") List<String> imGroupIds, @Param("num") int i);
 
     List<ImGroup> getByUserId(@Param("param") ImGroupWrapper.ImQuery query);
+
+    int updateMember(@Param("imGroupId") String imGroupId, @Param("num") int num);
 }

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

@@ -399,8 +399,14 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         imGroupMemberDao.insert(imGroupMember);
 
 
-        imGroup.setMemberNum(imGroupMemberDao.getByGroupId(Lists.newArrayList(imGroup.getId())).size());
-        imGroupDao.update(imGroup);
+        updateImGroupUserNumber(imGroup.getId());
+    }
+
+    private void updateImGroupUserNumber(String imGroupId) {
+        ImGroup imGroup = new ImGroup();
+        imGroup.setId(imGroupId);
+        imGroup.setMemberNum(imGroupMemberDao.getByGroupId(Lists.newArrayList(imGroupId)).size());
+        imGroupDao.updateMember(imGroup.getId(),imGroup.getMemberNum());
     }
 
     /**
@@ -470,6 +476,8 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 imGroupMember.setRoleType(roleType);
                 imGroupMember.setTenantId(imGroup.getTenantId());
                 imGroupMemberDao.insert(imGroupMember);
+
+                updateImGroupUserNumber(imGroup.getId());
             } catch (Exception e) {
                 log.error("加入群聊失败",e);
             }

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

@@ -758,6 +758,12 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
         if (schoolStaff == null) {
             throw new BizException("用户信息不存在");
         }
+        // 合作单位禁用下 不可启用
+        CooperationOrgan cooperationOrgan = cooperationOrganDao.get(schoolStaff.getSchoolId().intValue());
+        if (cooperationOrgan == null || !cooperationOrgan.getIsEnable()) {
+            throw new BizException("合作单位已禁用，不可启用");
+        }
+
         SysUser sysUser = sysUserService.queryUserById(schoolStaff.getUserId().intValue());
         if (StringUtils.isNotBlank(entity.getStatus())) {
             if (entity.getStatus().equals("1")) {

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

@@ -1333,7 +1333,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     public IPage<StudentWrapper.StudentList> userPage(IPage<StudentWrapper.StudentList> page, StudentWrapper.StudentQuery queryInfo) {
 
         if (CollectionUtils.isEmpty(queryInfo.getStatusList())) {
-            queryInfo.setStatusList(Arrays.asList(StudentMusicGroupStatusEnum.NORMAL, StudentMusicGroupStatusEnum.QUIT, StudentMusicGroupStatusEnum.QUIT_SCHOOL));
+            queryInfo.setStatusList(Arrays.asList(StudentMusicGroupStatusEnum.NORMAL));
         }
         List<StudentWrapper.StudentList> studentLists = studentPlusMapper.userPage(page, queryInfo);
 

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

@@ -262,6 +262,11 @@
         </foreach>
     </update>
 
+
+    <update id="updateMember">
+        update im_group set member_num_ = #{num} where id_ = #{imGroupId}
+    </update>
+
 	<select id="getByUserId" resultMap="ImGroup">
         SELECT ig.* FROM im_group_member igm
         LEFT JOIN im_group ig ON igm.im_group_id_ = ig.id_