From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
index 53fc4ec..212c273 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -598,7 +598,21 @@
vo.setObjectType(type);
vo.setObjectId(objectId);
vo.setOpId(opId);
- return siteClient.listExipre(vo);
+ List<TSiteDTO> tSiteDTOS = siteClient.listExipre(vo);
+ for (TSiteDTO tSiteDTO : tSiteDTOS) {
+ Integer storeId = tSiteDTO.getStoreId();
+ TStore byId = storeService.getById(storeId);
+ if (byId!=null){
+ if (byId.getType()==1){
+ tSiteDTO.setOperator("平台");
+ }else{
+ TOperator byId1 = tOperatorService.getById(tSiteDTO.getOperatorId());
+ if (byId1!=null)
+ tSiteDTO.setOperator(byId1.getName());
+ }
+ }
+ }
+ return tSiteDTOS;
}
@Autowired
--
Gitblit v1.7.1