接口调整

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceGroupApiServiceImpl.java

@@ -15,6 +15,8 @@ import com.gic.enterprise.response.EnterpriseServiceResponse;
 import com.gic.store.service.StoreWidgetApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -38,6 +40,7 @@ import com.gic.enterprise.error.ErrorCode;
  */
 @Service("resourceGroupApiService")
 public class ResourceGroupApiServiceImpl implements ResourceGroupApiService{
+    private static Logger logger = LogManager.getLogger(ResourceGroupApiServiceImpl.class);
     @Autowired
     private ResourceGroupService resourceGroupService;
     @Autowired
@@ -157,13 +160,7 @@ public class ResourceGroupApiServiceImpl implements ResourceGroupApiService{
         //资源组改成单选
         Integer resourceGroupId = resourceDTOList.get(0).getResourceId();
         TabSysResourceGroup resourceGroup = resourceGroupService.getResourceGroup(resourceGroupId);
-        //用户域是否授予
-        boolean hasAuthCustomUser = resourceGroup.getCustomUser() == 1;
-        if (hasAuthCustomUser) {
-            CustomUserAreaDTO result = new CustomUserAreaDTO().setType(ResourceHoldEnum.DART.getCode())
-                    .setCustomUser(resourceGroup.getCustomUser());
-            return ServiceResponse.success(result);
-        }
+
         List<ResourceGroupCustomUserDTO> customUserList = JSON.parseArray(resourceGroup.getCustomUserData(), ResourceGroupCustomUserDTO.class);
 
         CustomUserAreaDTO result = new CustomUserAreaDTO().setType(ResourceHoldEnum.DART.getCode())
@@ -222,6 +219,13 @@ public class ResourceGroupApiServiceImpl implements ResourceGroupApiService{
             if (StringUtils.isBlank(customUserData)) {
                 return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "用户域授予资源为空，请选择不授予");
             }
+
+            try {
+                List<ResourceGroupCustomUserDTO> customUserList = JSON.parseArray(customUserData, ResourceGroupCustomUserDTO.class);
+            } catch (Exception e) {
+                return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "用户域数据格式有误");
+            }
+
         }
         return ServiceResponse.success();
 

gic-platform-auth-service/src/main/resources/mapper/TabSysResourceGroupMapper.xml

@@ -218,7 +218,7 @@
     where resource_group_id = #{resourceGroupId}
   </update>
 
-  <select id="countRepeatResourceGroupName">
+  <select id="countRepeatResourceGroupName" resultType="int">
     select count(1) from tab_sys_resource_group
     where delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@NORMAL_STATUS}
     and resource_group_name = #{resourceGroupName}