123

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/rest/UserRestInterface.java

@@ -125,4 +125,20 @@ public interface UserRestInterface  {
         return  null;
     }
 
+    default  void  setPowerDataCorporation(DataInter dataInter){
+        UserDTO userDTO = getAdminUserInfoV2(true);
+        if (userDTO == null) {
+            return;
+        }
+        dataInter.setBizType(userDTO.getBizType());
+        Integer dataAll=userDTO.getDataAll()== null ? 2 : userDTO.getDataAll();
+        if (dataAll == 2){
+            List<Integer> dataCorporation2List = userDTO.dataCorporation2List() == null ? new ArrayList<>() : userDTO.dataCorporation2List();
+            if (dataCorporation2List.size() == 0) {
+                dataCorporation2List.add(0);
+            }
+            dataInter.setDataCorporationIds(dataCorporation2List);
+        }
+    }
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AdminCompanyInfoController.java

@@ -94,7 +94,7 @@ public class AdminCompanyInfoController extends BaseController<CompanyInfoApplyB
     @ApiModelProperty("商家信息")
     public  ObjectRestResponse info() {
         CompanyInfoFindDTO companyInfoFindDTO=new CompanyInfoFindDTO();
-        setPowerData(companyInfoFindDTO);
+        setPowerDataCorporation(companyInfoFindDTO);
         List<CompanyInfo> list = companyInfoBiz.getList(companyInfoFindDTO);
         if (list == null || list.size() == 0){
             throw  new BaseException("商家不存在", ResultCode.FAILED_CODE);