123

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/CompanyInfoBiz.java

@@ -232,6 +232,12 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
         if (companyInfoFindDTO.getDataCorporationIds() != null && companyInfoFindDTO.getDataCorporationIds().size() > 0){
             criteria.andIn("id",companyInfoFindDTO.getDataCorporationIds());
         }
+        if (companyInfoFindDTO.getDataCompanyIds() != null && companyInfoFindDTO.getDataCompanyIds().size() > 0){
+            BranchCompany branchCompany = branchCompanyBiz.selectById(companyInfoFindDTO.getDataCompanyIds().get(0));
+            if (branchCompany != null ){
+                criteria.andEqualTo("id",branchCompany.getCompanyId());
+            }
+        }
         example.setOrderByClause("crt_time desc ");
 
         return  selectByExample(example);

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();
-        setPowerDataCorporation(companyInfoFindDTO);
+        setPowerData(companyInfoFindDTO);
         List<CompanyInfo> list = companyInfoBiz.getList(companyInfoFindDTO);
         if (list == null || list.size() == 0){
             throw  new BaseException("商家不存在", ResultCode.FAILED_CODE);

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

@@ -131,6 +131,7 @@ public class ChwUserController extends CommonBaseController implements UserRestI
         vo.setCorporationId(getAdminUserInfoV2().getCorporationId());
         if(CollUtil.isNotEmpty(dataInterBean.getDataCompanyIds())) {
             vo.setCompanyId(dataInterBean.getDataCompanyIds().get(0));
+            vo.setDataCompany(dataInterBean.getDataCompanyIds().get(0)+"");
         }
 
         if (StringUtils.isNotBlank(username)) {