Merge remote-tracking branch 'origin/master'

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxServiceImpl.java

@@ -51,6 +51,7 @@ import com.unis.module.system.dal.mysql.permission.UserRoleMapper;
 import com.unis.module.system.dal.mysql.user.AdminUserMapper;
 import com.unis.module.system.enums.permission.RoleIdEnum;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -112,6 +113,10 @@ public class DwxxServiceImpl implements DwxxService {
     private UsersMapper usersMapper;
     @Resource
     private DictDataMapper dictDataMapper;
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+
+    private static final String ALL_AREA_LEVEL_KEY = "all_area_levels";
 
     @Override
     public Long createDwxx(DwxxSaveReqVO createReqVO) {
@@ -192,7 +197,15 @@ public class DwxxServiceImpl implements DwxxService {
         if ("0".equals(areaLevel) || ObjectUtil.isEmpty(areaLevel)) {
             if (pageReqVO.getAreaCode() != null) {
                 // 数据权限
-                pageReqVO.setAreaCode(AreaUtils.getAreaCode(pageReqVO.getAreaLevel(), pageReqVO.getAreaCode(), pageReqVO.getParentCode()));
+                //pageReqVO.setAreaCode(AreaUtils.getAreaCode(pageReqVO.getAreaLevel(), pageReqVO.getAreaCode(), pageReqVO.getParentCode()));
+
+                // 获取区域集合
+                List<AreaLevelDO> allAreaLevels = (List<AreaLevelDO>) redisTemplate.opsForValue().get(ALL_AREA_LEVEL_KEY);
+                if (CollectionUtils.isEmpty(allAreaLevels)) {
+                    allAreaLevels = areaLevelMapper.selectList(null);
+                }
+                // 根据区域级别设置区域代码
+                setAreaCodeBasedOnLevel(pageReqVO, allAreaLevels);
             }
             page = dwxxMapper.selectWrapperPage(new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO);
 
@@ -849,4 +862,49 @@ public class DwxxServiceImpl implements DwxxService {
 
     }
 
+    // 根据区域级别设置区域代码
+    private void setAreaCodeBasedOnLevel(DeliveryPageReqVO pageReqVO, List<AreaLevelDO> allAreaLevels) {
+        int areaLevel = pageReqVO.getAreaLevel();
+        switch (areaLevel) {
+            case 1:
+                AreaLevelDO sheng = findAreaLevel(allAreaLevels, pageReqVO.getAreaCode());
+                if (sheng != null) {
+                    pageReqVO.setAreaCode(String.format("%s%s", sheng.getAreaName(), "%"));
+                }
+                break;
+            case 2:
+                AreaLevelDO shi = findAreaLevel(allAreaLevels, pageReqVO.getAreaCode());
+                AreaLevelDO sheng2 = findAreaLevel(allAreaLevels, pageReqVO.getParentCode());
+                if (shi != null && sheng2 != null) {
+                    if (Arrays.asList(CityConstants.CITY).contains(sheng2.getAreaName())) {
+                        pageReqVO.setAreaCode(String.format("%s%s%s", sheng2.getAreaName(), "%", shi.getAreaName()));
+                    } else {
+                        pageReqVO.setAreaCode(String.format("%s%s%s%s", sheng2.getAreaName(), ",", shi.getAreaName(), "%"));
+                    }
+                }
+                break;
+            case 3:
+                AreaLevelDO xian = findAreaLevel(allAreaLevels, pageReqVO.getAreaCode());
+                AreaLevelDO shi3 = findAreaLevel(allAreaLevels, pageReqVO.getParentCode());
+                if (shi3 != null) {
+                    AreaLevelDO sheng3 = findAreaLevel(allAreaLevels, shi3.getParentCode());
+                    if (xian != null && sheng3 != null) {
+                        pageReqVO.setAreaCode(String.format("%s%s%s%s%s%s", sheng3.getAreaName(), ",", shi3.getAreaName(), ",", xian.getAreaName(), "%"));
+                    }
+                }
+                break;
+        }
+    }
+
+    // 根据区域代码查找 AreaLevelDO 对象
+    private AreaLevelDO findAreaLevel(List<AreaLevelDO> allAreaLevels, String areaCode) {
+        if (areaCode == null) {
+            return allAreaLevels.stream().findFirst().orElse(null);
+        }
+        return allAreaLevels.stream()
+                .filter(a -> a.getAreaCode().equals(areaCode))
+                .findFirst()
+                .orElse(null);
+    }
+
 }

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dwxx/DwxxMapper.xml

@@ -78,7 +78,7 @@
                 </otherwise>
             </choose>
             <if test="pageReqVO.areaCode!=null and pageReqVO.areaCode!=''">
-                and ck.xzqhdm like #{pageReqVO.areaCode}
+                and ck.sheng like #{pageReqVO.areaCode}
             </if>
             <if test="pageReqVO.kqStart!=null and pageReqVO.kqEnd!=null ">
                 and IFNULL(t1.sjcrNum, 0)between #{pageReqVO.kqStart} and #{pageReqVO.kqEnd}