From 7d98f48d82a5b2d0b4c42ea412fa160e41e3be9c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 10:54:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 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 389d9cd..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
@@ -26,7 +26,7 @@
@Override
public List<GuideEvolveEntity> selectConfigList(String guideId,SysUser sysUser) {
List<GuideEvolveEntity> guideEvolveEntities;
- if (sysUser.getUserType().equals("4")){
+ if ((sysUser.getUserType().equals("3")&&sysUser.getIsDivisionHead().equals("2"))||(sysUser.getUserType().equals("4"))){
guideEvolveEntities=baseMapper.selectHideList(guideId);
}else {
guideEvolveEntities = baseMapper.selectConfigList(guideId);
--
Gitblit v1.7.1