From 5997e4563931162a1ef4de584173cce56ccd7eae Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Sat, 12 Feb 2022 17:00:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E5=AD=97=E6=AE=B5=E6=88=AA?= =?UTF-8?q?=E5=8F=96=E4=BF=AE=E6=94=B9=E7=BA=A6=E6=9D=9F=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../department/impl/DepartmentServiceImpl.java | 16 ++++++++-------- .../service/impl/AreaServiceImpl.java | 4 ++-- .../service/impl/MongoAreaServiceImpl.java | 2 +- .../service/impl/DepartmentServiceImpl.java | 18 +++++++++--------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java index e0e9ef99..37441ba3 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java @@ -76,14 +76,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart @Override public List listAllByAreaCode(String departmentAreaCode) { Map params = getHashMap(2); - params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3)); return list(params); } @Override public List listAllByAreaCodeAndOrder(String departmentAreaCode, String order) { Map params = getHashMap(6); - params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3)); params.put("sort", "departmentAreaCode"); params.put("order", order); return list(params); @@ -92,7 +92,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart @Override public List listSubAllByAreaCode(String departmentAreaCode) { Map params = getHashMap(4); - params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3)); params.put("excludeDepartmentAreaCode", departmentAreaCode); return list(params); } @@ -100,7 +100,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart @Override public List listSubAllByAreaCodeAndOrder(String departmentAreaCode, String order) { Map params = getHashMap(8); - params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3)); params.put("excludeDepartmentAreaCode", departmentAreaCode); params.put("sort", "departmentAreaCode"); params.put("order", order); @@ -131,20 +131,20 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart @Override public SuccessResultList> listPageAllByAreaCode(String departmentAreaCode, ListPage page) { - page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3)); return listPage(page); } @Override public SuccessResultList> listPageSubAllByAreaCode(String departmentAreaCode, ListPage page) { - page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3)); page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode); return listPage(page); } @Override public SuccessResultList> listPageSubAllByAreaCodeAndType(String departmentAreaCode, Integer departmentType, ListPage page) { - page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3)); page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode); page.getParams().put("departmentType", departmentType); return listPage(page); @@ -305,7 +305,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart @Override public Integer countAllByAreaCode(String areaCode) { Map params = getHashMap(2); - params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3)); return count(params); } } diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/AreaServiceImpl.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/AreaServiceImpl.java index 3e61d8ba..93765d60 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/AreaServiceImpl.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/AreaServiceImpl.java @@ -120,14 +120,14 @@ public class AreaServiceImpl extends DefaultBaseService implements IAreaService @Override public List listByCode(String areaCode) { Map params = getHashMap(1); - params.put("areaCode", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); + params.put("areaCode", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3)); return areaDao.list(params); } @Override public List listSubByCode(String areaCode) { Map params = getHashMap(4); - params.put("areaCode", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); + params.put("areaCode", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3)); params.put("excludeAreaCode", areaCode); return areaDao.list(params); } diff --git a/mongo-module-dictionary/src/main/java/ink/wgink/mongo/module/dictionary/service/impl/MongoAreaServiceImpl.java b/mongo-module-dictionary/src/main/java/ink/wgink/mongo/module/dictionary/service/impl/MongoAreaServiceImpl.java index a5dffa2e..bf780f1e 100644 --- a/mongo-module-dictionary/src/main/java/ink/wgink/mongo/module/dictionary/service/impl/MongoAreaServiceImpl.java +++ b/mongo-module-dictionary/src/main/java/ink/wgink/mongo/module/dictionary/service/impl/MongoAreaServiceImpl.java @@ -103,7 +103,7 @@ public class MongoAreaServiceImpl extends DefaultBaseService implements IMongoAr @Override public List listSubByCode(String areaCode) { - String baseAreaCode = WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0'); + String baseAreaCode = WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3); Pattern pattern = Pattern.compile("^" + baseAreaCode + "((?!" + areaCode.replace(baseAreaCode, "") + ").)*$", Pattern.CASE_INSENSITIVE); Query query = new Query(); query.addCriteria(Criteria.where("areaCode").regex(pattern)); diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java index 1b631329..eb607cfc 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java @@ -252,14 +252,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart @Override public List listAllByAreaCode(String departmentAreaCode) { Map params = getHashMap(2); - params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3)); return list(params); } @Override public List listAllByAreaCodeAndOrder(String departmentAreaCode, String order) { Map params = getHashMap(6); - params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3)); params.put("sort", "departmentAreaCode"); params.put("order", order); return list(params); @@ -268,7 +268,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart @Override public List listSubAllByAreaCode(String departmentAreaCode) { Map params = getHashMap(4); - params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3)); params.put("excludeDepartmentAreaCode", departmentAreaCode); return list(params); } @@ -276,7 +276,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart @Override public List listSubAllByAreaCodeAndOrder(String departmentAreaCode, String order) { Map params = getHashMap(8); - params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3)); params.put("excludeDepartmentAreaCode", departmentAreaCode); params.put("sort", "departmentAreaCode"); params.put("order", order); @@ -314,20 +314,20 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart @Override public SuccessResultList> listPageAllByAreaCode(String areaCode, ListPage page) { - page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); + page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3)); return listPage(page); } @Override public SuccessResultList> listPageSubAllByAreaCode(String departmentAreaCode, ListPage page) { - page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3)); page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode); return listPage(page); } @Override public SuccessResultList> listPageSubAllByAreaCodeAndType(String departmentAreaCode, Integer departmentType, ListPage page) { - page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3)); page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode); page.getParams().put("departmentType", departmentType); return listPage(page); @@ -386,7 +386,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart if (StringUtils.isBlank(departmentParentId) || StringUtils.equals(departmentParentId, "0")) { params.put("departmentAreaCode", departmentAreaCode); } else { - params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3)); params.put("departmentParentId", departmentParentId); } params.put("departmentType", departmentType); @@ -531,7 +531,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart @Override public Integer countAllByAreaCode(String areaCode) { Map params = getHashMap(2); - params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3)); return count(params); }