From f88cfa02e36752e4acad7adc4b045155e8e50f21 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluationServiceImpl.java | 9 +++++++--
1 files changed, 7 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..b103c04 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,16 +34,21 @@
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
--
Gitblit v1.7.1