json转化调整

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/LoginController.java

@@ -10,6 +10,7 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.gic.auth.dto.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -20,10 +21,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.constant.LoginUserTypeEnum;
-import com.gic.auth.dto.MenuDTO;
-import com.gic.auth.dto.ResourceGroupDataDTO;
-import com.gic.auth.dto.UserDTO;
-import com.gic.auth.dto.UserResourceDTO;
 import com.gic.auth.service.*;
 import com.gic.commons.annotation.HeaderSignIgnore;
 import com.gic.commons.util.EntityUtil;
@@ -278,7 +275,18 @@ public class LoginController {
             ServiceResponse<ResourceGroupDataDTO> response = resourceGroupApiService.getResourceGroupByUserId(userId);
             if (resource.isSuccess()) {
                 ResourceGroupDataDTO resourceGroupDataDTO = response.getResult();
-                detail.setCustomUserInfo(EntityUtil.changeEntityByJSON(CustomUserInfo.class, resourceGroupDataDTO.getCustomUserAreaDTO()));
+                CustomUserAreaDTO customUserAreaDTO  = resourceGroupDataDTO.getCustomUserAreaDTO();
+                CustomUserInfo customUserInfo = new CustomUserInfo();
+                if (customUserAreaDTO != null) {
+                    List<ResourceGroupCustomUserDTO> customUserList = customUserAreaDTO.getCustomUserList();
+                    if (CollectionUtils.isNotEmpty(customUserList)) {
+                        List<ResourceGroupCustomUserInfo> customUserInfoList = EntityUtil.changeEntityListNew(ResourceGroupCustomUserInfo.class, customUserList);
+                        customUserAreaDTO.setCustomUserList(null);
+                        customUserInfo = EntityUtil.changeEntityByJSON(CustomUserInfo.class, customUserAreaDTO);
+                        customUserInfo.setCustomUserList(customUserInfoList);
+                    }
+                }
+                detail.setCustomUserInfo(customUserInfo);
                 detail.setStoreResourceInfo(EntityUtil.changeEntityNew(StoreResourceInfo.class, resourceGroupDataDTO.getStoreResourceDTO()));
                 detail.setGoodsResourceInfo(EntityUtil.changeEntityNew(GoodsResourceInfo.class, resourceGroupDataDTO.getGoodsResourceDTO()));
             } else {