From ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 03 一月 2025 15:30:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java
index 1b2ed39..28835e0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java
@@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -101,6 +102,7 @@
wrapper.lambda().eq(Areas::getId,areas.getId());
Areas update = new Areas();
update.setName(areas.getName());
+ update.setCode(areas.getCode());
update.setSortnum(areas.getSortnum());
areasMapper.update(update,wrapper);
//鍒锋柊缂撳瓨鏁版嵁
@@ -316,6 +318,7 @@
return result;
}
@Override
+ @PostConstruct
public void cacheData() {
Areas a = new Areas();
a.setIsdeleted(Constants.ZERO);
@@ -324,7 +327,7 @@
CITY_LIST=null;
AREA_LIST = null;
ALL_AREA_TREE = null;
- ALL_AREA_LIST = areasMapper.selectList(new QueryWrapper<>(a).lambda().orderByDesc(Areas::getSortnum));
+ ALL_AREA_LIST = areasMapper.selectList(new QueryWrapper<>(a).lambda().orderByAsc(Areas::getCode));
if(ALL_AREA_LIST!=null){
for(Areas model : ALL_AREA_LIST){
if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
--
Gitblit v1.9.3