|
@@ -48,8 +48,6 @@ public class SaasRoleServiceImpl implements ISaasRoleService {
|
|
SaasRole saasRole = ConvertSaasRoleTool.INSTANCE.convertAddDto2Entity(addSaasRoleDTO);
|
|
SaasRole saasRole = ConvertSaasRoleTool.INSTANCE.convertAddDto2Entity(addSaasRoleDTO);
|
|
// 设置默认值
|
|
// 设置默认值
|
|
setDefaultValue(saasRole);
|
|
setDefaultValue(saasRole);
|
|
- // 判断角色名称是否重复
|
|
|
|
- checkDuplicateName(addSaasRoleDTO.getRoleName());
|
|
|
|
FmResponseContent<String> response = saasRoleClient.createSaasRole(saasRole);
|
|
FmResponseContent<String> response = saasRoleClient.createSaasRole(saasRole);
|
|
return response.getContent();
|
|
return response.getContent();
|
|
}
|
|
}
|
|
@@ -101,10 +99,10 @@ public class SaasRoleServiceImpl implements ISaasRoleService {
|
|
throw new IllegalArgumentException("找不到要更新的数据,id: " + updateSaasRoleDTO.getId());
|
|
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 = ConvertSaasRoleTool.INSTANCE.convertUpdateDto2Entity(saasRole, updateSaasRoleDTO);
|
|
saasRole.setDefaultValue();
|
|
saasRole.setDefaultValue();
|