From 4de0934e7fe5ee7f1c7021e5a6f07c349147a87b Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sat, 1 Feb 2025 16:22:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=8A=9F=E8=83=BD=E3=80=81=E5=A4=9A=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=B2=97=E4=BD=8D=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/shiro/filter/FormFilter.java | 20 ++-- .../sys/web/user/EmpUserController.java | 100 +++++++++++++----- .../main/resources/config/jeesite-core.yml | 5 +- .../views/include/sysIndex/topMenu.html | 1 + .../views/include/sysIndex/topMenuCorp.html | 2 +- .../views/include/sysIndex/topMenuOffice.html | 27 +++++ .../views/include/sysIndex/topMenuUser.html | 2 +- .../src/main/resources/config/application.yml | 10 +- .../src/main/resources/config/application.yml | 5 +- web/src/main/resources/config/application.yml | 10 +- 10 files changed, 144 insertions(+), 38 deletions(-) create mode 100644 modules/core/src/main/resources/views/include/sysIndex/topMenuOffice.html diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java index 57250659..3eaadd7c 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java @@ -54,8 +54,11 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica public static final String MESSAGE_PARAM = "message"; // 登录返回消息 public static final String REMEMBER_USERCODE_PARAM = "rememberUserCode"; // 记住用户名 public static final String EXCEPTION_ATTRIBUTE_NAME = "exception"; // 异常类属性名 - public static final String LOGIN_PARAM = "__login"; // 支持GET方式登录的参数 - + public static final String LOGIN_PARAM = "__login"; // 支持GET方式登录的参数 + + public static final Boolean POST_ROLE_PERMI = Global.getConfigToBoolean("user.postRolePermi", "false"); + public static final Boolean SWITCH_OFFICE = Global.getConfigToBoolean("user.switchOffice", "false"); + private static final Logger logger = LoggerFactory.getLogger(FormFilter.class); private static FormFilter instance; @@ -477,9 +480,9 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica } } data.put("roleList", roleList); - List> postList = ListUtils.newArrayList(); - if (Global.getConfigToBoolean("user.postRolePermi", "false") - && User.USER_TYPE_EMPLOYEE.equals(user.getUserType())) { + if (POST_ROLE_PERMI && User.USER_TYPE_EMPLOYEE.equals(user.getUserType())) { + List> postList = ListUtils.newArrayList(); + data.put("postRolePermi", "true"); Employee employee = user.getRefObj(); for (EmployeePost ep : EmpUtils.getEmployeePostList(employee.getEmpCode())){ Post post = ep.getPost(); @@ -490,8 +493,13 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica postList.add(postMap); } } + data.put("postList", postList); + } + if (SWITCH_OFFICE && User.USER_TYPE_EMPLOYEE.equals(user.getUserType())) { + data.put("switchOffice", "true"); + data.put("officeCode", EmpUtils.getCurrentOfficeCode()); + data.put("officeName", EmpUtils.getCurrentOfficeName()); } - data.put("postList", postList); data.put("desktopUrl", desktopUrl != null ? desktopUrl : Global.getConfig("sys.index.desktopUrl")); return data; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java index cbf8f844..cbfe1366 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONValidator; import com.jeesite.common.codec.EncodeUtils; import com.jeesite.common.collect.ListUtils; import com.jeesite.common.collect.MapUtils; +import com.jeesite.common.collect.SetUtils; import com.jeesite.common.config.Global; import com.jeesite.common.entity.Page; import com.jeesite.common.lang.DateUtils; @@ -18,6 +19,7 @@ import com.jeesite.common.shiro.realm.AuthorizingRealm; import com.jeesite.common.utils.excel.ExcelExport; import com.jeesite.common.utils.excel.annotation.ExcelField.Type; import com.jeesite.common.web.BaseController; +import com.jeesite.common.web.http.ServletUtils; import com.jeesite.modules.sys.entity.*; import com.jeesite.modules.sys.service.*; import com.jeesite.modules.sys.utils.EmpUtils; @@ -29,6 +31,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -41,7 +44,8 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; +import java.util.Set; +import java.util.concurrent.atomic.AtomicReference; /** * 员工用户Controller @@ -446,41 +450,89 @@ public class EmpUserController extends BaseController { } /** - * 获取当前用户附属部门 - * @return + * 获取当前用户部门（包括附属部门） v5.10.1 */ @RequiresPermissions("user") @RequestMapping(value = "officeListData") @ResponseBody - public List officeListData () { - Employee employee = EmpUtils.getEmployee(); - return employeeService.findEmployeeOfficeList(employee); + public List officeListData() { + Office office = EmpUtils.getOffice(); + EmployeeOffice employeeOffice = new EmployeeOffice(); + employeeOffice.setOfficeCode(office.getOfficeCode()); + employeeOffice.setViewCode(office.getViewCode()); + employeeOffice.setOfficeName(office.getOfficeName()); + employeeOffice.setFullName(office.getFullName()); + employeeOffice.setTreeNames(office.getTreeNames()); + List list = ListUtils.newArrayList(employeeOffice); + list.addAll(EmpUtils.getEmployeeOfficeList()); + return list; } - /** - * 切换当前用户到附属部门 - * @param officeCode - * @return + * 切换部门菜单（用户->部门(含附属部门)->岗位->角色）v5.10.1 */ @RequiresPermissions("user") - @RequestMapping(value = "switchOffice/{officeCode}") - @ResponseBody - public String switchOffice(@PathVariable String officeCode) { - if (StringUtils.equals(officeCode, "default")) { + @RequestMapping(value = {"switchOffice","switchOffice/{officeCode}"}) + public String switchOffice(@PathVariable(required=false) String officeCode, HttpServletRequest request, HttpServletResponse response) { + Session session = UserUtils.getSession(); + Set postCodes = SetUtils.newHashSet(); + if (StringUtils.isNotBlank(officeCode)){ + // 查询用户关联的岗位 + AtomicReference officeCodeRef = new AtomicReference<>(); + AtomicReference officeNameRef = new AtomicReference<>(); + // 如果是当前用户主部门 Office office = EmpUtils.getOffice(); - EmpUtils.setCurrentOffice(office.getOfficeCode(), office.getOfficeName()); - return renderResult(Global.TRUE, text("部门切换成功！")); - } - List employeeOfficeList = EmpUtils.getEmployeeOfficeList().stream() - .filter(e -> StringUtils.equals(e.getOfficeCode(), officeCode)).collect(Collectors.toList()); - if (!employeeOfficeList.isEmpty()) { - EmployeeOffice office = employeeOfficeList.get(0); - EmpUtils.setCurrentOffice(office.getOfficeCode(), office.getOfficeName()); - return renderResult(Global.TRUE, text("部门切换成功！")); + if (StringUtils.equals(officeCode, office.getOfficeCode())) { + officeCodeRef.set(office.getOfficeCode()); + officeNameRef.set(StringUtils.defaultIfBlank(office.getFullName(), office.getOfficeName())); + EmpUtils.getEmployeePostList().forEach(ep -> { + postCodes.add(ep.getPostCode()); + }); + } + // 如果是当前用户的附属部门 + else { + EmpUtils.getEmployeeOfficeList().forEach(eo -> { + if (StringUtils.equals(officeCode, eo.getOfficeCode())) { + officeCodeRef.set(eo.getOfficeCode()); + officeNameRef.set(StringUtils.defaultIfBlank(eo.getFullName(), eo.getOfficeName())); + postCodes.add(eo.getPostCode()); + } + }); + } + // 如果匹配不到，有权限切换的部门，则给于提示 + if (StringUtils.isAnyBlank(officeCodeRef.get(), officeNameRef.get())) { + return renderResult(response, Global.FALSE, text("没有权限切换到该部门")); + } + EmpUtils.setCurrentOffice(session, officeCodeRef.get(), officeNameRef.get()); } else { - return renderResult(Global.FALSE, text("部门切换失败，所切换部门不是您的附属部门！")); + EmpUtils.removeCurrentOffice(session); } + // 开启 user.postRolePermi 参数后，就可以使用岗位关联角色过滤菜单权限 + if (Global.getConfigToBoolean("user.postRolePermi", "false")) { + if (!postCodes.isEmpty()) { + // 查询并设置岗位关联的角色 + PostRole where = new PostRole(); + where.setPostCode_in(postCodes.toArray(new String[0])); + where.sqlMap().loadJoinTableAlias("r"); + List roleCodes = ListUtils.newArrayList(); + postService.findPostRoleList(where).forEach(e -> { + if (e.getRole() != null && PostRole.STATUS_NORMAL.equals(e.getRole().getStatus())) { + roleCodes.add(e.getRoleCode()); + } + }); + if (roleCodes.isEmpty()){ + roleCodes.add("__none__"); + } + session.setAttribute("roleCode", StringUtils.joinComma(roleCodes)); // 5.4.0+ 支持多个，逗号隔开 + } else { + session.removeAttribute("roleCode"); + } + } + UserUtils.removeCache(UserUtils.CACHE_AUTH_INFO+"_"+session.getId()); + if (ServletUtils.isAjaxRequest(request)) { + return renderResult(response, Global.TRUE, text("部门切换成功")); + } + return REDIRECT + adminPath + "/index"; } } diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index e6d8c2cd..5b0d4f17 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -150,8 +150,11 @@ user: # 二级管理员的控制权限类型（1拥有的权限 2管理的权限，管理功能包括：用户管理、组织机构、公司管理等）（v4.1.5+） adminCtrlPermi: 2 - # 是否启用岗位角色，开启后将 用户->岗位->关联角色，纳入菜单和权限管理 + # 是否启用岗位角色，开启后将 用户->岗位->关联角色，纳入菜单和权限管理 v5.9.2 postRolePermi: false + + # 是否启用切换部门功能，再开启启用岗位角色后可支持 用户->附属部门->岗位->关联角色，纳入菜单和权限管理 v5.10.1 + switchOffice: false # 多租户模式（SAAS模式）（专业版） useCorpModel: false diff --git a/modules/core/src/main/resources/views/include/sysIndex/topMenu.html b/modules/core/src/main/resources/views/include/sysIndex/topMenu.html index e112b0fa..305c2b64 100644 --- a/modules/core/src/main/resources/views/include/sysIndex/topMenu.html +++ b/modules/core/src/main/resources/views/include/sysIndex/topMenu.html @@ -10,6 +10,7 @@
    <% include('/include/sysIndex/topMenuCorp.html'){} %> + <% include('/include/sysIndex/topMenuOffice.html'){} %>
    • <% include('/include/sysIndex/topMenuLang.html'){} %> diff --git a/modules/core/src/main/resources/views/include/sysIndex/topMenuCorp.html b/modules/core/src/main/resources/views/include/sysIndex/topMenuCorp.html index 15a67302..c79b9315 100644 --- a/modules/core/src/main/resources/views/include/sysIndex/topMenuCorp.html +++ b/modules/core/src/main/resources/views/include/sysIndex/topMenuCorp.html @@ -1,7 +1,7 @@ <% if(@Global.getConfigToBoolean('user.useCorpModel', 'false') && hasPermi('sys:corpAdmin:edit')){ %>
  • - ${text('当前租户')}：(${session.corpCode}) ${session.corpName} + ${text('当前租户')}：${currentCorpName}
    <#form:treeselect id="switchCorpSelect" title="${text('租户切换')}" allowClear="false" url="${ctx}/sys/corpAdmin/treeData?isShowCode=true" callbackFuncName="switchCorpSelectCallback"/> diff --git a/modules/core/src/main/resources/views/include/sysIndex/topMenuOffice.html b/modules/core/src/main/resources/views/include/sysIndex/topMenuOffice.html new file mode 100644 index 00000000..316024ca --- /dev/null +++ b/modules/core/src/main/resources/views/include/sysIndex/topMenuOffice.html @@ -0,0 +1,27 @@ +<% if(toBoolean(switchOffice!)){ %> +
  • + + ${officeName!} + +
    <#form:treeselect id="switchOfficeSelect" title="${text('部门切换')}" allowClear="false" + url="${ctx}/sys/empUser/officeListData?isShowCode=true" callbackFuncName="switchOfficeSelectCallback" + fieldNames="{'id':'officeCode','name':'fullName'}"/> +
    + +
    • +<% } %> diff --git a/modules/core/src/main/resources/views/include/sysIndex/topMenuUser.html b/modules/core/src/main/resources/views/include/sysIndex/topMenuUser.html index 895d12b5..6971c507 100644 --- a/modules/core/src/main/resources/views/include/sysIndex/topMenuUser.html +++ b/modules/core/src/main/resources/views/include/sysIndex/topMenuUser.html @@ -47,7 +47,7 @@ <% }else{ %>
  • <% } %> - <% if(postList.~size > 0){ %> + <% if(toBoolean(postRolePermi!) && postList.~size > 0){ %>
  • <% var postCode = @ObjectUtils.toStringIgnoreNull(session.postCode, ''); %>
  • ${text('选择岗位')}：<% if(isNotBlank(postCode)){ %> diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml index fa06289b..98ccc865 100644 --- a/web-api/src/main/resources/config/application.yml +++ b/web-api/src/main/resources/config/application.yml @@ -303,9 +303,12 @@ spring: # maxPoolSize: 20 # keepAliveSeconds: 60 -# 日志配置 +# 日志配置（fatal、error、warn、info、debug） logging: config: classpath:config/logback-spring.xml +# level: +# root: warn +# com.jeesite: debug #======================================# #========== System settings ===========# @@ -350,8 +353,11 @@ user: # # 二级管理员的控制权限类型（1拥有的权限 2管理的权限，管理功能包括：用户管理、组织机构、公司管理等）（v4.1.5+） # adminCtrlPermi: 2 # -# # 是否启用岗位角色，开启后将 用户->岗位->关联角色，纳入菜单和权限管理 +# # 是否启用岗位角色，开启后将 用户->岗位->关联角色，纳入菜单和权限管理 v5.9.2 # postRolePermi: false +# +# # 是否启用切换部门功能，再开启启用岗位角色后可支持 用户->附属部门->岗位->关联角色，纳入菜单和权限管理 v5.10.1 +# switchOffice: false # 多租户模式（SAAS模式）（专业版） useCorpModel: false diff --git a/web-fast/src/main/resources/config/application.yml b/web-fast/src/main/resources/config/application.yml index 60c6a402..8d49fcfb 100644 --- a/web-fast/src/main/resources/config/application.yml +++ b/web-fast/src/main/resources/config/application.yml @@ -99,9 +99,12 @@ spring: pathmatch: matching-strategy: ANT_PATH_MATCHER -# 日志配置 +# 日志配置（fatal、error、warn、info、debug） logging: config: classpath:config/logback-spring.xml +# level: +# root: warn +# com.jeesite: debug #======================================# #========== System settings ===========# diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index 126f9aef..dfa5a2c9 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -303,9 +303,12 @@ spring: # maxPoolSize: 20 # keepAliveSeconds: 60 -# 日志配置 +# 日志配置（fatal、error、warn、info、debug） logging: config: classpath:config/logback-spring.xml +# level: +# root: warn +# com.jeesite: debug #======================================# #========== System settings ===========# @@ -350,8 +353,11 @@ user: # # 二级管理员的控制权限类型（1拥有的权限 2管理的权限，管理功能包括：用户管理、组织机构、公司管理等）（v4.1.5+） # adminCtrlPermi: 2 # -# # 是否启用岗位角色，开启后将 用户->岗位->关联角色，纳入菜单和权限管理 +# # 是否启用岗位角色，开启后将 用户->岗位->关联角色，纳入菜单和权限管理 v5.9.2 # postRolePermi: false +# +# # 是否启用切换部门功能，再开启启用岗位角色后可支持 用户->附属部门->岗位->关联角色，纳入菜单和权限管理 v5.10.1 +# switchOffice: false # 多租户模式（SAAS模式）（专业版） useCorpModel: false