From 7a8e31ceb01c7eb27d90197ec91efdfce4bedb41 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 16 十一月 2022 18:00:39 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 74ed2f1..389d9cd 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("4")){
+ guideEvolveEntities=baseMapper.selectHideList(guideId);
+ }else {
+ guideEvolveEntities = baseMapper.selectConfigList(guideId);
+ }
for (GuideEvolveEntity guideEvolveEntity: guideEvolveEntities) {
String[] split;
if (guideEvolveEntity.getAccessoryId()!=null){
--
Gitblit v1.7.1