From 3eda5364adada942f76a9f8a5f57881406f44286 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 29 十月 2025 10:10:38 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index e38c277..2f65c55 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -56,6 +56,12 @@
@Autowired
private TCrmClinicService crmClinicService;
+ private final ISysUserService sysUserService;
+
+ public SysUserController(ISysUserService sysUserService) {
+ this.sysUserService = sysUserService;
+ }
+
/**
* 获取用户列表
*/
@@ -74,6 +80,11 @@
TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
.eq(TCrmSupplier::getUserId, userId)
.last("LIMIT 1"));
+ // ***
+ if(Objects.isNull(crmSupplier)){
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
+ }
query.setObjectId(crmSupplier.getId());
}
if(roleType == 5){
@@ -81,6 +92,11 @@
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, userId)
.last("LIMIT 1"));
+ // ---
+ if(Objects.isNull(crmClinic)){
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
query.setObjectId(crmClinic.getId());
}
PageInfo<SysUserVO> list = userService.pageList(query);
@@ -189,6 +205,11 @@
TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
.eq(TCrmSupplier::getUserId, userId)
.last("LIMIT 1"));
+ // ***
+ if(Objects.isNull(crmSupplier)){
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
+ }
user.setObjectId(crmSupplier.getId());
}
if(roleType == 5){
@@ -196,6 +217,11 @@
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, userId)
.last("LIMIT 1"));
+ // ---
+ if(Objects.isNull(crmClinic)){
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
user.setObjectId(crmClinic.getId());
}
user.setRoleType(roleType);
--
Gitblit v1.7.1