From 5b83b50d38c757b38dcc87a40a17d34cc2948e10 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 15 三月 2024 09:49:15 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluationServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 d0f0e24..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
@@ -28,22 +28,27 @@
private AppUserClient appUserClient;
@Override
- public List<TEvaluationListVo> listAll(Page<TEvaluationListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName) {
+ public List<TEvaluationListVo> listAll(Page<TEvaluationListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName,List<Integer >operatorId) {
List<TAppUser> list = appUserClient.queryByNamePhone(new QueryByNamePhone(name,phone));
if(list.size()==0){
return new ArrayList<>();
}
- List<TEvaluationListVo> tEvaluationListVos = this.baseMapper.listAll(page, provinceCode, cityCode, name, phone, shopName);
+ 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