From c58a42aa1acc821e0c3e748de7205e58af6c350b Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Tue, 01 Sep 2020 16:44:25 +0800 Subject: [PATCH] 1.修改充值页面,可支持修改起始结束时间 2.修改添加医院/医生页面,增加自动选择当前服务/销售人员 3.调整页面部分显示细节问题 --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysMenuServiceImpl.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysMenuServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysMenuServiceImpl.java index e5c747a..9c95f74 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysMenuServiceImpl.java +++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysMenuServiceImpl.java @@ -1,6 +1,7 @@ package com.kidgrow.usercenter.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.kidgrow.common.constant.CommonConstant; import com.kidgrow.common.context.ClientContextHolder; import com.kidgrow.common.model.ResultBody; import com.kidgrow.common.model.SysMenu; @@ -67,7 +68,11 @@ @Override public List<SysMenu> findByRoleCodes(Set<String> roleCodes, Integer type) { - return roleMenuService.findMenusByRoleCodes(roleCodes, type, ClientContextHolder.getClient()); + String tentid=ClientContextHolder.getClient(); + if (roleCodes.contains(CommonConstant.SYSTEM_ADMIN_ROLE_CODE)) { + tentid=""; + } + return roleMenuService.findMenusByRoleCodes(roleCodes, type,tentid); } /** -- Gitblit v1.8.0