From d643b843cc794d8f59c4ecd04bda2b9d35e5b22a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 19:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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