From 25f25ef359995bafc1e33a1e65c09593ce8ad13a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Wed, 10 May 2023 09:46:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E7=AB=99=E7=82=B9=E4=B8=9A?=
=?UTF-8?q?=E5=8A=A1=E8=AF=B7=E6=B1=82=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../module/site/service/impl/SiteServiceImpl.java | 5 ++---
.../java/com/mortals/httpclient/system/system.http | 13 ++++++++++++-
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java b/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
index 60d1500c..cd202a41 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
@@ -16,6 +16,7 @@ import com.mortals.framework.util.DataUtil;
import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.AreaLevelDxTypeEnum;
+import com.mortals.xhx.common.code.AreaLevelEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.pdu.RespData;
@@ -454,12 +455,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
throw new AppException("褰撳墠绔欑偣鏃犲瓙鍖哄煙锛�");
}
siteAreaVo.setAreaCode(areaEntity.getAreaCode());
- siteAreaVo.setAreaName("甯傛湰绾�");
+ siteAreaVo.setAreaName(AreaLevelEnum.getByValue(areaEntity.getAreaLevel()).getValue()==AreaLevelEnum.鍦板競宸�.getValue()?"甯傛湰绾�":areaEntity.getName());
List<SiteEntity> siteEntityList = this.find(new SiteQuery().areaCode(areaEntity.getAreaCode()));
- // List<SiteEntity> siteIdlist = this.getFlatSitesBySiteId(query.getId(), context);
siteAreaVo.setSiteList(siteEntityList);
list.add(siteAreaVo);
-
//涓ゅ眰缁撴瀯{xxx:[{sitename:xxx},{}...],bbb:[{sitename:xxx},{}...]}
AreaQuery areaQuery = new AreaQuery();
areaQuery.setPid(areaEntity.getIid());
diff --git a/base-manager/src/test/java/com/mortals/httpclient/system/system.http b/base-manager/src/test/java/com/mortals/httpclient/system/system.http
index 41c04749..a7baa62d 100644
--- a/base-manager/src/test/java/com/mortals/httpclient/system/system.http
+++ b/base-manager/src/test/java/com/mortals/httpclient/system/system.http
@@ -122,11 +122,22 @@ Content-Type: application/json
{
"method":"post",
- "type": 1,
+ "type": 2,
"path":"/api/edge-service-agent/1.0/46ce3be3269e8894/cxyhbhsfz_",
"body":"{\"idCardNo\":\"41010229611620007X\",\"orgNo\":\"10080000\"}"
}
+### trans1
+POST {{baseUrl}}/mid/trans
+Content-Type: application/json
+
+{
+ "method":"post",
+ "type": 2,
+ "path":"/api/edge-service-agent/1.0/8d0b663762f8bba6/cxbzlb_",
+ "body":"{\"accountId\":\"1018145\"}"
+}
+
###鐭俊璁剧疆缂栬緫
GET {{baseUrl}}/sms/set/edit?id={{SmsSet_id}}
Accept: application/json
--
2.24.3