lixing 4 lat temu
rodzic
commit
8cd0206562

+ 1 - 1
fm-person/src/main/java/com/persagy/fm/department/service/impl/DepartmentServiceImpl.java

@@ -513,7 +513,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         // 拼装查询条件
         QueryWrapper<Department> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(Department.PROP_VALID, ValidEnum.TRUE.getType());
-        // 按创建时间序排序
+        // 按创建时间序排序
         queryWrapper.orderBy(true, true, Department.PROP_CREATIONTIME);
 
         if (CollectionUtils.isEmpty(parentIds)) {

+ 4 - 6
fm-person/src/main/java/com/persagy/fm/saas/role/service/impl/SaasRoleServiceImpl.java

@@ -48,8 +48,6 @@ public class SaasRoleServiceImpl implements ISaasRoleService {
         SaasRole saasRole = ConvertSaasRoleTool.INSTANCE.convertAddDto2Entity(addSaasRoleDTO);
         // 设置默认值
         setDefaultValue(saasRole);
-        // 判断角色名称是否重复
-        checkDuplicateName(addSaasRoleDTO.getRoleName());
         FmResponseContent<String> response = saasRoleClient.createSaasRole(saasRole);
         return response.getContent();
     }
@@ -101,10 +99,10 @@ public class SaasRoleServiceImpl implements ISaasRoleService {
             throw new IllegalArgumentException("找不到要更新的数据,id: " + updateSaasRoleDTO.getId());
         }
 
-        if (StringUtils.isNotBlank(updateSaasRoleDTO.getRoleName()) &&
-                !saasRole.getRoleName().equals(updateSaasRoleDTO.getRoleName())) {
-            checkDuplicateName(updateSaasRoleDTO.getRoleName());
-        }
+//        if (StringUtils.isNotBlank(updateSaasRoleDTO.getRoleName()) &&
+//                !saasRole.getRoleName().equals(updateSaasRoleDTO.getRoleName())) {
+//            checkDuplicateName(updateSaasRoleDTO.getRoleName());
+//        }
         // 将更新的属性赋值给查询到的对象
         saasRole = ConvertSaasRoleTool.INSTANCE.convertUpdateDto2Entity(saasRole, updateSaasRoleDTO);
         saasRole.setDefaultValue();