From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java
index 5dfb290..a2d416b 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java
@@ -24,8 +24,13 @@
private TransactionEventMapper transactionEventMapper;
@Override
- public List<GuideEvolveEntity> selectConfigList(String guideId) {
- List<GuideEvolveEntity> guideEvolveEntities = baseMapper.selectConfigList(guideId);
+ public List<GuideEvolveEntity> selectConfigList(String guideId,SysUser sysUser) {
+ List<GuideEvolveEntity> guideEvolveEntities;
+ if ((sysUser.getUserType().equals("3")&&sysUser.getIsDivisionHead().equals("2"))||(sysUser.getUserType().equals("4"))){
+ guideEvolveEntities=baseMapper.selectHideList(guideId);
+ }else {
+ guideEvolveEntities = baseMapper.selectConfigList(guideId);
+ }
for (GuideEvolveEntity guideEvolveEntity: guideEvolveEntities) {
String[] split;
if (guideEvolveEntity.getAccessoryId()!=null){
@@ -65,10 +70,6 @@
return baseMapper.updateGuid();
}
- @Override
- public int countStatisticsNum(String state, String isTimeout) {
- return baseMapper.countStatisticsNum(state,isTimeout);
- }
}
--
Gitblit v1.7.1