Sfoglia il codice sorgente

修改bug:
运营平台,租户删除租户,该租户没有添加任何下级机构删除时提示有下级机构

jiakai 4 mesi fa
parent
commit
3aaed3b519

+ 6 - 4
platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -536,18 +536,20 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
                         .select(SysDept::getId)
                         .eq(SysDept::getSystemCode, sysSystem.getSysCode())).stream()
                         .map(SysDept::getId).collect(Collectors.toList());
-                if (CollUtil.isNotEmpty(deptIdList)) {
+                // 需要排除当前租户自己
+                if (CollUtil.isNotEmpty(deptIdList) && CollUtil.size(deptIdList) > 1) {
                     errorStr = "租户["+sysSystem.getSysName()+"]还有部分子机构,请将这些子机构删除后,再进行删除!";
                     return errorStr;
                 }
 
-                Long count = sysUserJzgInfoMapper.selectCount(new LambdaQueryWrapper<SysUserJzgInfo>()
+                List<SysUserJzgInfo> sysUserJzgInfos = sysUserJzgInfoMapper.selectList(new LambdaQueryWrapper<SysUserJzgInfo>()
                         .eq(SysUserJzgInfo::getSystemCode, sysSystem.getSysCode())
                         .eq(SysUserJzgInfo::getIsEnable, 0)
                         .eq(SysUserJzgInfo::getIsDelete, 0));
 
-                if(count > 0){
-                    errorStr = "租户["+sysSystem.getSysName()+"]还有部分员工,请将这些员工变更机构或者删除后,再进行删除!";
+                if(CollUtil.size(sysUserJzgInfos) > 0){
+                    String names = sysUserJzgInfos.stream().map(SysUserJzgInfo::getName).collect(Collectors.joining("、"));
+                    errorStr = "租户["+sysSystem.getSysName()+"]还有[" + names + "]等员工,请将这些员工变更机构或者删除后,再进行删除!";
                     return errorStr;
                 }
             }