Merge remote-tracking branch 'origin/developer' into developer

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

@@ -11,10 +11,8 @@ import com.gic.auth.dto.SmsSignResourceDTO;
 import com.gic.auth.dto.UserResourceDTO;
 import com.gic.auth.entity.TabSysOrderAppResource;
 import com.gic.auth.entity.TabSysResource;
-import com.gic.auth.service.OrderAppResourceService;
-import com.gic.auth.service.ResourceApiService;
-import com.gic.auth.service.ResourceService;
-import com.gic.auth.service.UserResourceService;
+import com.gic.auth.entity.TabSysUser;
+import com.gic.auth.service.*;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.error.ErrorCode;
@@ -48,6 +46,8 @@ public class ResourceApiServiceImpl implements ResourceApiService {
     private UserResourceService userResourceService;
     @Autowired
     private OrderAppResourceService orderAppResourceService;
+    @Autowired
+    private UserService userService;
 
     @Override
     @Transactional
@@ -144,15 +144,27 @@ public class ResourceApiServiceImpl implements ResourceApiService {
 
     @Override
     public ServiceResponse<SmsSignResourceDTO> getSmsResourceByUserId(Integer userId) {
+        TabSysUser user = userService.getUserById(userId);
+        if (user.getSuperAdmin() == 1) {
+            // 是超管就返回所有
+            SmsSignResourceDTO superAdminResource = new SmsSignResourceDTO();
+            superAdminResource.setType(1);
+            return EnterpriseServiceResponse.success(superAdminResource);
+        }
+
+
         List<UserResourceDTO> userResourceList = userResourceService.listUserResourceByUserId(userId);
+        SmsSignResourceDTO defaultResource = new SmsSignResourceDTO();
+        defaultResource.setType(2);
+        defaultResource.setIdList(Collections.emptyList());
         if (CollectionUtils.isEmpty(userResourceList)) {
-            return EnterpriseServiceResponse.success();
+            return EnterpriseServiceResponse.success(defaultResource);
         }
         List<Integer> resourceIds = userResourceList.stream().map(UserResourceDTO::getResourceId).collect(Collectors.toList());
         List<TabSysResource> resourceList = resourceService.listByIds(resourceIds);
         List<Integer> smsSignList = resourceList.stream().filter(Objects::nonNull).map(TabSysResource::getSmsSignResource).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(smsSignList)) {
-            return EnterpriseServiceResponse.success();
+            return EnterpriseServiceResponse.success(defaultResource);
         }
         List<TabSysOrderAppResource> orderAppResourceList = orderAppResourceService.listByIds(smsSignList, OrderOrAppEnum.SMS_SIGN.getCode());
         SmsSignResourceDTO result = new SmsSignResourceDTO();