Merge branch 'develop_tzs_register_to_0715' of…

Merge branch 'develop_tzs_register_to_0715' of http://36.40.66.175:5000/moa/amos-boot-biz into develop_tzs_register_to_0715 # Conflicts: # 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/DPStatisticsServiceImpl.java

Merge branch 'develop_tzs_register_to_0715' of…
8909826c · suhuiguang · 6a13d3df · 8606d1e9 · 8909826c
Commit 8909826c authored Jul 10, 2024 by suhuiguang
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

DPStatisticsServiceImpl.java ...t/module/jg/biz/service/impl/DPStatisticsServiceImpl.java +1 -1

No files found.
--- a/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/DPStatisticsServiceImpl.java
+++ b/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/DPStatisticsServiceImpl.java
@@ -245,7 +245,7 @@ public class DPStatisticsServiceImpl {
        String orgCode = regionCodeOrgCodeMap.get(dpFilterParamDto.getCityCode());
        if (orgCode == null) {
            orgCode = commonMapper.getOrgCodeByCompanyCode(dpFilterParamDto.getCityCode());
-            if(orgCode == null){
+            if (orgCode == null) {
                return;
            }
            regionCodeOrgCodeMap.put(dpFilterParamDto.getCityCode(), orgCode);