修bug

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -179,20 +179,19 @@ public class RequirementsServiceImpl implements RequirementsService {
             Integer districtCode = requirementsInfoQO.getDistrictCode();
             Integer cityCode = requirementsInfoQO.getCityCode();
             List<RequirementsInfoDO> requirementsInfoDOS1 = new ArrayList<>();
-            requirementsInfoDOS.stream().map(requirementsInfoDO -> {
-                if (requirementsInfoDO.getDistrictCode() != null && requirementsInfoDO.getDistrictCode().equals(districtCode)) {
+            requirementsInfoDOS = requirementsInfoDOS.stream().map(requirementsInfoDO -> {
+                if(requirementsInfoDO.getDistrictCode().equals(districtCode)) {
                     requirementsInfoDOS1.add(requirementsInfoDO);
                 }
                 return requirementsInfoDO;
-            }).filter(requirementsInfoDO -> requirementsInfoDO.getDistrictCode() != districtCode).map(requirementsInfoDO -> {
-                if (requirementsInfoDO.getCityCode() != null && requirementsInfoDO.getCityCode().equals(cityCode)) {
+            }).filter(requirementsInfoDO -> !requirementsInfoDO.getDistrictCode().equals(districtCode)).collect(Collectors.toList());
+            requirementsInfoDOS = requirementsInfoDOS.stream().map(requirementsInfoDO -> {
+                if(requirementsInfoDO.getCityCode().equals(cityCode)) {
                     requirementsInfoDOS1.add(requirementsInfoDO);
                 }
                 return requirementsInfoDO;
-            }).filter(requirementsInfoDO -> requirementsInfoDO.getCityCode() != cityCode).map(requirementsInfoDO -> {
-                requirementsInfoDOS1.add(requirementsInfoDO);
-                return requirementsInfoDO;
-            }).collect(Collectors.toList());
+            }).filter(requirementsInfoDO -> !requirementsInfoDO.getCityCode().equals(cityCode)).collect(Collectors.toList());
+            requirementsInfoDOS1.addAll(requirementsInfoDOS);
             requirementsInfoDOS = requirementsInfoDOS1;
         }
 

release-service/src/main/resources/application-local.yml

@@ -54,7 +54,6 @@ spring:
     database: 1
     host: 127.0.0.1
     port: 6379
-    password: MMC@2022&REDIS
     #连接池
     lettuce:
       shutdown-timeout: 1000 # 关闭超时时间-ms

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -1748,7 +1748,10 @@
                ri.service_name,
                ri.create_time,
                ri.repertory,
-               ri.require_num
+               ri.require_num,
+               ri.province_code,
+               ri.city_code,
+               ri.district_code
         FROM requirements_info ri
                  left join requirements_amount ra
                            on ra.requirements_info_id = ri.id and ri.user_account_id = ra.user_account_id