From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 一月 2025 18:15:00 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluationServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluationServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluationServiceImpl.java
index 1eeeed6..c09c097 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluationServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluationServiceImpl.java
@@ -34,23 +34,30 @@
return new ArrayList<>();
}
- List<TEvaluationListVo> tEvaluationListVos = this.baseMapper.listAll(page, provinceCode, cityCode, name, phone, shopName,operatorId);
+ ArrayList<TEvaluationListVo> res = new ArrayList<>();
+
+ List<TEvaluationListVo> tEvaluationListVos = this.baseMapper.listAll(page, provinceCode, cityCode,
+ shopName, phone, shopName,operatorId);
for (TEvaluationListVo tEvaluationListVo : tEvaluationListVos) {
for (TAppUser tAppUser : list) {
if(tEvaluationListVo.getAppUserId().equals(tAppUser.getId())){
tEvaluationListVo.setName(tAppUser.getName());
tEvaluationListVo.setPhone(tAppUser.getPhone());
+ res.add(tEvaluationListVo);
+ break;
}
}
}
- return tEvaluationListVos;
+ return res;
}
@Override
public TEvaluationListVo info(Integer id) {
TEvaluationListVo info = this.baseMapper.info(id);
Integer appUserId = info.getAppUserId();
+ System.err.println("查詢用戶");
TAppUser tAppUser = appUserClient.queryById(appUserId);
+ System.err.println("========="+tAppUser);
info.setName(tAppUser.getName());
info.setPhone(tAppUser.getPhone());
return info;
--
Gitblit v1.7.1