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

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

@@ -149,11 +149,13 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 
         // 修改合作单位下的用户，改为锁定
 
-        List<SchoolStaff> schoolStaffs = schoolStaffMapper.getByCoopIdAndType(cooperationOrgan.getId(), null);
+        if (!cooperationOrgan.getIsEnable()) {
+            List<SchoolStaff> schoolStaffs = schoolStaffMapper.getByCoopIdAndType(cooperationOrgan.getId(), null);
 
 
-        for (SchoolStaff schoolStaff : schoolStaffs) {
-            sysUserFeignService.exitByPhone("education", sysUserService.queryUserById(schoolStaff.getUserId().intValue()).getPhone());
+            for (SchoolStaff schoolStaff : schoolStaffs) {
+                sysUserFeignService.exitByPhone("education", sysUserService.queryUserById(schoolStaff.getUserId().intValue()).getPhone());
+            }
         }
 
         schoolStaffMapper.updateStatusAndRecoveryStatus(cooperationOrgan.getIsEnable(), cooperationOrgan.getId());