diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java index 966c5051..7ffebf14 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java @@ -22,4 +22,9 @@ public class UserModel { * 登录名 */ private String loginname; + + /** + * 登录名 + */ + private String deptId; } diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java index 3005b9ae..d7e1c690 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java @@ -349,8 +349,8 @@ public class SysUserServiceImpl extends ServiceImpl i user.setUserOrg(userOrgEntity); user.setUserBusiness(businessList); user.setCompanyCodes(companyEntitys); -// user.setUserModels(this.getUserCompanyList(userEntity.getCompany())); - user.setUserModels(this.getUserAuthList(String.valueOf(userEntity.getDeptId()))); + user.setUserModels(this.getUserCompanyList(userEntity.getCompany())); +// user.setUserModels(this.getUserAuthList(String.valueOf(userEntity.getDeptId()))); // 刷新菜单缓存处理 this.setMetnuRedis(userEntity.getUserId()); user.setEmailCodes(emailCodes); diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml index 5bd716f6..67859f3a 100644 --- a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml +++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml @@ -59,8 +59,11 @@