diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserDao.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserDao.java index 11d52ee9..f9852f31 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserDao.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserDao.java @@ -86,6 +86,15 @@ public interface SysUserDao extends BaseMapper { */ List getUserCompanyList(@Param("company") String company); + /** + * 根据公司编码获取税号 + * + * @param id + * 公司id + * @return 税号 + */ + List getUserAuthList(@Param("deptId") 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 c9ae4164..3005b9ae 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,7 +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.getUserCompanyList(userEntity.getCompany())); + user.setUserModels(this.getUserAuthList(String.valueOf(userEntity.getDeptId()))); // 刷新菜单缓存处理 this.setMetnuRedis(userEntity.getUserId()); user.setEmailCodes(emailCodes); @@ -365,6 +366,11 @@ public class SysUserServiceImpl extends ServiceImpl i return baseMapper.getUserCompanyList(company); } + private List getUserAuthList(String deptId) { + DynamicContextHolder.push(DbConstant.BASICS_READ); + return baseMapper.getUserAuthList(deptId); + } + private MenuModel setMetnuRedis(long userId) { MenuModel menuModel = new MenuModel(); List userMenuList = sysMenuService.getUserMenuList(userId); diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml index 77e94ee5..5bd716f6 100644 --- a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml +++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml @@ -64,6 +64,16 @@ WHERE company = #{company} + +