fixbug

server-service/src/main/java/com/makeit/service/saas/impl/SaasRoleServiceImpl.java

@@ -86,17 +86,23 @@ implements SaasRoleService{
     }
 
     private void check(SaasRoleDTOVO dto) {
-        SaasRole old = getOne(new QueryWrapper<SaasRole>().lambda()
+        List<SaasRole> oldList = list(new QueryWrapper<SaasRole>().lambda()
                 .eq(SaasRole::getName, dto.getName()));
+        for (SaasRole old : oldList) {
             if (old != null && !old.getId().equals(dto.getId())) {
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_NAME_DUPLICATE);
             }
+        }
+
+
+        oldList = list(new QueryWrapper<SaasRole>().lambda()
+                .eq(SaasRole::getCode, dto.getCode()));
+        for (SaasRole old : oldList) {
+            if (old != null && !old.getId().equals(dto.getId())) {
+                throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_CODE_DUPLICATE);
+            }
+        }
 
-//        old = getOne(new QueryWrapper<SaasRole>().lambda()
-//                .eq(SaasRole::getName, dto.getName()));
-//        if (old != null && !old.getId().equals(dto.getId())) {
-//            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_CODE_DUPLICATE);
-//        }
     }
 
     @Transactional

server-service/src/main/java/com/makeit/service/saas/impl/SaasUserServiceImpl.java

@@ -186,7 +186,7 @@ implements SaasUserService{
     private void setRoleList(SaasUserDTOVO dto) {
         saasUserRoleService.remove(new QueryWrapper<SaasUserRole>().lambda()
                 .eq(SaasUserRole::getUserId, dto.getId()));
-        if (CollectionUtils.isNotEmpty(dto.getRoleList())) {
+        if (CollectionUtils.isNotEmpty(dto.getRoleIdList())) {
             List<SaasUserRole> userRoleList = StreamUtil.map(dto.getRoleIdList(), e -> {
                 SaasUserRole saasUserRole = new SaasUserRole();
                 saasUserRole.setUserId(dto.getId());

server-web/src/main/resources/application.yml

@@ -82,7 +82,7 @@ mybatis-plus:
   global-config:
     db-config:
       id-type: ASSIGN_ID
-      update-strategy: not_empty
+      update-strategy: not_null
       insert-strategy: not_empty
       where-strategy: not_empty