diff --git a/zeroerr_oa-admin/src/main/resources/application.yml b/zeroerr_oa-admin/src/main/resources/application.yml index f44ce9a..c61cd27 100644 --- a/zeroerr_oa-admin/src/main/resources/application.yml +++ b/zeroerr_oa-admin/src/main/resources/application.yml @@ -7,8 +7,8 @@ ruoyi: # 版权年份 copyrightYear: 2024 # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) - profile: D:/zeroerr/uploadPath - #profile: /home/zeroerr_oa/uploadPath + #profile: D:/zeroerr/uploadPath + profile: /home/zeroerr_oa/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 @@ -76,8 +76,8 @@ spring: # 数据库索引 database: 0 # 密码 - #password: 123456 - password: + password: 123456 + #password: # 连接超时时间 timeout: 10s lettuce: diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/EntryManageController.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/EntryManageController.java index 49191a6..9f6243b 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/EntryManageController.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/EntryManageController.java @@ -109,19 +109,19 @@ public class EntryManageController extends BaseController { @ApiOperation(value = "下载入职管理记录") @Log(title = "下载入职管理记录", businessType = BusinessType.EXPORT) public void export(HttpServletResponse response, EntryManage req) { - boolean isHr = false; - List sysRoles = iSysRoleService.rolesByUserId(getUserId()); - if (!CollectionUtils.isEmpty(sysRoles)) { - for (SysRole sysRole : sysRoles) { - //如果角色是hr - if (sysRole.getRoleKey().equals("hr") || sysRole.getRoleKey().equals("hrleader")) { - isHr = true; - } - } - } - if (isHr) { - req.setHrId(getUserId()); - } +// boolean isHr = false; +// List sysRoles = iSysRoleService.rolesByUserId(getUserId()); +// if (!CollectionUtils.isEmpty(sysRoles)) { +// for (SysRole sysRole : sysRoles) { +// //如果角色是hr +// if (sysRole.getRoleKey().equals("hr") || sysRole.getRoleKey().equals("hrleader")) { +// isHr = true; +// } +// } +// } +// if (isHr) { +// req.setHrId(getUserId()); +// } List entryManageList = entryManageService.listBySelect(req); //将序号重新排列 for (int i = 0; i < entryManageList.size(); i++) {