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 | 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