diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index 96b2913..dcc5f73 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -230,9 +230,10 @@ public class SysLoginController Set permissions = permissionService.getMenuPermission(user); AjaxResult ajax = AjaxResult.success(); //获取企业未处理求职者条数 - if(roles.contains(String.valueOf(StringUtil.COMPANY_ADMIN_ROLE_KEY))){ + boolean flag = user.getRoles().stream().anyMatch(it -> StringUtil.COMPANY_ADMIN_ROLE_KEY.equals(it.getRoleId())); + if(flag){ Integer pendCount = jobApplyService.selectPendCount(user.getIdCard()); - ajax.put("pendCount", pendCount == null ? 0 : pendCount); + user.setPendCount(pendCount == null ? 0 : pendCount); } ajax.put("user", user); ajax.put("roles", roles); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 30ca138..864cc96 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -114,6 +114,9 @@ public class SysUser extends BaseEntity /**身份证机密性*/ private String idCardEncrypt; + /**未处理求职者条数*/ + public Integer pendCount; + public SysUser() { @@ -374,6 +377,14 @@ public class SysUser extends BaseEntity this.idCardEncrypt = idCardEncrypt; } + public Integer getPendCount() { + return pendCount; + } + + public void setPendCount(Integer pendCount) { + this.pendCount = pendCount; + } + public void setRoleIdsStr(String roleIdsStr) { this.roleIdsStr = roleIdsStr; if (!StringUtils.isBlank(roleIdsStr)) { @@ -412,6 +423,7 @@ public class SysUser extends BaseEntity .append("roleIdsStr", getRoleIdsStr()) .append("phonenumberEncrypt", getPhonenumberEncrypt()) .append("idCardEncrypt", getIdCardEncrypt()) + .append("pendCount", getPendCount()) .toString(); } }