From 19dde21187ef9edfdb38f60fbe764bddf3d2466d Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 13 九月 2025 14:39:29 +0800
Subject: [PATCH] 登录用户没取科室病区
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 18 ++++++++++++++++++
ruoyi-admin/src/main/resources/application-druid.yml | 28 +++++++++++++++-------------
2 files changed, 33 insertions(+), 13 deletions(-)
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 2defc77..75fd88e 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
@@ -5,7 +5,9 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.SysUserDept;
import com.ruoyi.common.core.domain.model.LoginBody;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.SecurityUtils;
@@ -15,6 +17,7 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysMenuService;
+import com.smartor.mapper.SysUserDeptMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -56,6 +59,9 @@
@Value("${isEncryp}")
private Integer isEncryp;
+
+ @Autowired
+ private SysUserDeptMapper sysUserDeptMapper;
/**
* 鐧诲綍鏂规硶
@@ -133,6 +139,18 @@
ajax.put("user", user);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
+ List<SysUserDept> sysUserDeptKSs = null;
+ List<SysUserDept> sysUserDeptBQs = null;
+ SysUserDept sysUserDept = new SysUserDept();
+ sysUserDept.setUserId(user.getUserId());
+ sysUserDept.setDeptType("1");
+ sysUserDept.setOrgid(user.getOrgid());
+ sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
+ ajax.put("belongDepts", sysUserDeptKSs);
+ sysUserDept.setDeptType("2");
+ sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
+ ajax.put("belongWards", sysUserDeptBQs);
+
return ajax;
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 6a1a1f7..ce28524 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -48,9 +48,9 @@
# 浠庡簱鏁版嵁婧�
slave:
enabled: true
- url: jdbc:oracle:thin:@//192.168.100.10:1521/orcl
- username: healthy
- password: healthy
+ url: jdbc:oracle:thin:@//192.200.85.40:1521/hzsyhis
+ username: wssf
+ password: Hzsywssf
driver-class-name: oracle.jdbc.OracleDriver
# enabled: true
# url: jdbc:mysql://192.168.100.10:3306/emr?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
@@ -86,8 +86,8 @@
# 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
maxEvictableIdleTimeMillis: 900000
# 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
- # validationQuery: SELECT 1 FROM DUAL
- validationQuery: SELECT 1
+ validationQuery: SELECT 1 FROM DUAL
+ #validationQuery: SELECT 1
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
@@ -113,12 +113,14 @@
multi-statement-allow: true
# redis 閰嶇疆
redis:
- host: 192.168.100.10
- port: 6020
- # 鏁版嵁搴撶储寮�
+# host: 192.168.100.10
+# port: 6020
+# database: 0
+# password: Smartor
+ host: 127.0.0.1
+ port: 6379
database: 0
- # 瀵嗙爜
- password: Smartor
+ password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
@@ -231,11 +233,11 @@
#鏈� 鍦� 鐭俊璇锋眰鍦板潃(杩欎釜鏈嶅姟鏄垜浠嚜宸卞啓鐨�)
#xhsmsPath: http://192.168.2.13:8092/sendSms
#鏂板崕鐭俊璇锋眰鍦板潃(杩欎釜鏈嶅姟鏄垜浠嚜宸卞啓鐨�)
-xhsmsPath: http://192.16.4.220:8092/sendSms
+xhsmsPath: http://121.41.98.232:8001/sms/api/sendMessageMass
#甯愬彿
-xhsmsAccount: 911124
+xhsmsAccount: 300044
#鎺ュ彛瀵嗙爜
-xhsmsPwd: zW5eXe
+xhsmsPwd: qj0NHDegxWhj
#铏氭嫙鎺ュ叆鐮�
xhsmsjrm: 1069055
--
Gitblit v1.9.3