27436 监管业务系统，改造告知单发起申请时，地市/区县/街道信息选择之后，工程装置并没有根据所选区域进行筛选

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgProjectContraptionServiceImpl.java

@@ -35,6 +35,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StopWatch;
+import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -191,6 +192,31 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
         String useRegDetail = params.get("useRegDetail");
         // 登录人公司类型：企业，监管
         String companyLevel = this.getCompanyLevel(company);
+        //获取省
+        String province = params.get("province");
+        if(!StringUtils.isEmpty(province) && province.contains("_")){
+            province= province.split("_")[0];
+        }
+        //获取市
+        String city = params.get("city");
+        if(!StringUtils.isEmpty(city) && city.contains("_")){
+            city= city.split("_")[0];
+        }
+        //获取区
+        String county = params.get("county");
+        if(!StringUtils.isEmpty(county) && county.contains("_")){
+            county= county.split("_")[0];
+        }
+        //获取街道
+        String street = params.get("street");
+        if(!StringUtils.isEmpty(street) && street.contains("_")){
+            street= street.split("_")[0];
+        }
+        //获取街道
+        String useUnitCreditCode = params.get("useUnitCreditCode");
+        if(!StringUtils.isEmpty(useUnitCreditCode) && useUnitCreditCode.contains("_")){
+            useUnitCreditCode= useUnitCreditCode.split("_")[0];
+        }
         IPage<IdxBizJgProjectContraption> pageList = lambdaQuery()
                 // 企业按照公司类型进行过滤
                 .eq(BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel) && CompanyTypeEnum.CONSTRUCTION.getName().equals(companyType), IdxBizJgProjectContraption::getUscUnitCreditCode, companyCode)
@@ -202,6 +228,11 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
                 .eq(!ValidationUtil.isEmpty(useRegistrationCode), IdxBizJgProjectContraption::getUseRegistrationCode, useRegistrationCode)
                 .eq(!ValidationUtil.isEmpty(equCategory), IdxBizJgProjectContraption::getEquCategory, equCategory)
                 .eq(!ValidationUtil.isEmpty(equDefine), IdxBizJgProjectContraption::getEquDefine, equDefine)
+                .eq(!ValidationUtil.isEmpty(province), IdxBizJgProjectContraption::getProvince, province)
+                .eq(!ValidationUtil.isEmpty(city), IdxBizJgProjectContraption::getCity, city)
+                .eq(!ValidationUtil.isEmpty(county), IdxBizJgProjectContraption::getCounty, county)
+                .eq(!ValidationUtil.isEmpty(street), IdxBizJgProjectContraption::getStreet, street)
+                .eq(!ValidationUtil.isEmpty(useUnitCreditCode), IdxBizJgProjectContraption::getUseUnitCreditCode, useUnitCreditCode)
                 .like(!ValidationUtil.isEmpty(projectContraption), IdxBizJgProjectContraption::getProjectContraption, projectContraption)
                 .eq(!ValidationUtil.isEmpty(orgBranchCode) && BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel), IdxBizJgProjectContraption::getOrgCode, orgBranchCode)            // 企业 等于匹配
                 .likeRight(!ValidationUtil.isEmpty(orgBranchCode) && BaseController.COMPANY_TYPE_SUPERVISION.equals(companyLevel), IdxBizJgProjectContraption::getOrgCode, orgBranchCode) // 监管 右模糊匹配