Browse Source

1.处理解绑校验

yuanliang 1 year ago
parent
commit
84ba396009

+ 10 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantUnbindRecordServiceImpl.java

@@ -221,16 +221,6 @@ public class TenantUnbindRecordServiceImpl extends ServiceImpl<TenantUnbindRecor
         }
         Teacher teacher = teacherDao.selectById(unbindRecord.getUserId());
 
-        // 判断是否存在机构小组群主身份
-        QueryWrapper<TenantGroup> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda()
-                .eq(TenantGroup::getTenantId, teacher.getTenantId())
-                .eq(TenantGroup::getAdminId, teacher.getUserId());
-        Integer count = tenantGroupMapper.selectCount(queryWrapper);
-        if (count > 0) {
-            throw new BizException("该老师存在机构小组负责人身份,请先更换老师或者退出小组");
-        }
-
         this.lambdaUpdate()
                 .set(TenantUnbindRecord::getStatus, Boolean.TRUE.equals(audio.getStatus()) ?
                         ETenantUnBindAuditStatus.PASS : ETenantUnBindAuditStatus.UNPASS)
@@ -241,6 +231,16 @@ public class TenantUnbindRecordServiceImpl extends ServiceImpl<TenantUnbindRecor
                 .eq(TenantUnbindRecord::getStatus, ETenantUnBindAuditStatus.DOING)
                 .update();
         if (Boolean.TRUE.equals(audio.getStatus())) {
+            // 判断是否存在机构小组群主身份
+            QueryWrapper<TenantGroup> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda()
+                    .eq(TenantGroup::getTenantId, teacher.getTenantId())
+                    .eq(TenantGroup::getAdminId, teacher.getUserId());
+            Integer count = tenantGroupMapper.selectCount(queryWrapper);
+            if (count > 0) {
+                throw new BizException("该老师存在机构小组负责人身份,请先更换老师或者退出小组");
+            }
+
             Long tenantId = teacher.getTenantId();
             if (tenantId != -1L) {
                 // 解散机构群