From e78c77c6dc98ed0f667c77713eb78f253298b06f Mon Sep 17 00:00:00 2001 From: yefei Date: Sat, 7 Oct 2023 11:19:23 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E8=AE=A4=E8=AF=81=E4=BA=BA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/admin/sys/dao/SysUserDao.java | 9 +++++++++ .../admin/sys/service/impl/SysUserServiceImpl.java | 8 +++++++- .../src/main/resources/mapper/sys/SysUserDao.xml | 10 ++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) 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} + +