From 851497204a0090d945e366a8a8f1f6e1751fe69f Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 10 Feb 2022 14:01:49 +0800
Subject: [PATCH] 服务范围列表修改地区码传参方式

---
 screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java
index a0d4997..c267dbe 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java
@@ -10,6 +10,7 @@
 import com.moral.api.service.ServicesScopeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.moral.constant.Constants;
+import com.moral.util.RegionCodeUtils;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -63,17 +64,12 @@
             QueryWrapper<Organization> organizationQueryWrapper = new QueryWrapper<>();
             organizationQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
             organizationQueryWrapper.eq("id",organizationId);
-            if (!ObjectUtils.isEmpty(map.get("province_code"))){
-                organizationQueryWrapper.eq("province_code",Integer.parseInt(map.get("province_code").toString()));
-            }
-            if (!ObjectUtils.isEmpty(map.get("city_code"))){
-                organizationQueryWrapper.eq("city_code",Integer.parseInt(map.get("city_code").toString()));
-            }
-            if (!ObjectUtils.isEmpty(map.get("area_code"))){
-                organizationQueryWrapper.eq("area_code",Integer.parseInt(map.get("area_code").toString()));
+            if (!ObjectUtils.isEmpty(map.get("regionCode"))){
+                String region = RegionCodeUtils.regionCodeConvertToName(Integer.parseInt(map.get("regionCode").toString()));
+                organizationQueryWrapper.eq(region,Integer.parseInt(map.get("regionCode").toString()));
             }
             Organization organization = new Organization();
-            organization = organizationMapper.selectById(organizationId);
+            organization = organizationMapper.selectOne(organizationQueryWrapper);
             if (ObjectUtils.isEmpty(organization)){
                 continue;
             }

--
Gitblit v1.8.0