From 5e09cd9bc9f370058460ca56222a0c82096a8c7d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 17 九月 2026 16:32:57 +0800
Subject: [PATCH] 【市一】随访增加院区限制
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 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 7562a08..56e2f35 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
@@ -2,6 +2,7 @@
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.SysUserDept;
@@ -11,6 +12,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.SysPermissionService;
+import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysUserDeptMapper;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
@@ -78,7 +80,7 @@
//閫氱敤瀵嗙爜锛欻rs#褰撳墠骞存湀鏃�*
token = loginService.getTokenWN(loginBody.getUsername());
} else {
- token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid(), loginBody.getCampusid());
+ token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid(), loginBody.getCampusid(), loginBody.getUserType());
}
ajax.put(Constants.TOKEN, token);
return ajax;
@@ -123,12 +125,14 @@
// @IpWhitelist
@GetMapping("/SSOLogin")
public RedirectView SSOLogin(@RequestParam(required = false) String campusid, @RequestParam(required = false) String deptId, @RequestParam(required = false) String systype, String orgid, String userName, String token) {
+ log.info("SSOLogin鐨勫叆鍙傦紝campusid锛歿}, deptId:{}, systype:{}, orgid:{}, userName:{}, token:{}",campusid,deptId,systype,orgid,userName,token);
if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token) && StringUtils.isEmpty(orgid)) {
throw new BaseException("鍙傛暟涓嶈兘涓虹┖");
}
String path = null;
if (StringUtils.isEmpty(systype)) path = sysConfigService.selectConfigByKey("sys.qddz");
else path = sysConfigService.selectConfigByKey("sys.qddz.yd");
+ log.info("qddz鐨勬煡璇㈠�间负锛宲ath锛歿}",path);
if (StringUtils.isEmpty(path)) {
throw new BaseException("璇烽厤缃墠绔湴鍧�");
@@ -205,13 +209,22 @@
}
/**
- * 鑾峰彇鐢ㄦ埛淇℃伅
+ * 鑾峰彇鐢ㄦ埛淇℃伅(鐧诲綍)
*
* @return 鐢ㄦ埛淇℃伅
*/
@GetMapping("getInfo")
public AjaxResult getInfo() {
SysUser user = SecurityUtils.getLoginUser().getUser();
+ //鏄剧ず鎵�鏈夐櫌鍖烘潈闄�
+ String allCampus = sysConfigService.selectConfigByKey("sys.authority.campus.all");
+ if(StringUtils.isNotEmpty(allCampus)){
+ allCampus = "," + allCampus + ",";
+ if (allCampus.contains("," + user.getUserName() + ",")) {
+ user.setCampusid(null);
+ }
+ }
+
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
@@ -220,18 +233,18 @@
ajax.put("user", user);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
- List<SysUserDept> sysUserDeptKSs = null;
- List<SysUserDept> sysUserDeptBQs = null;
+ List<SysDept> sysDeptKSs = null;
+ List<SysDept> sysDeptBQs = null;
SysUserDept sysUserDept = new SysUserDept();
sysUserDept.setUserId(user.getUserId());
sysUserDept.setDeptType("1");
sysUserDept.setOrgid(user.getOrgid());
sysUserDept.setCampusid(user.getCampusid());
- sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
- ajax.put("belongDepts", sysUserDeptKSs);
+ sysDeptKSs = sysDeptService.selectLeafSysDeptListBySysUserDept(sysUserDept);
+ ajax.put("belongDepts", sysDeptKSs);
sysUserDept.setDeptType("2");
- sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
- ajax.put("belongWards", sysUserDeptBQs);
+ sysDeptBQs = sysDeptService.selectLeafSysDeptListBySysUserDept(sysUserDept);
+ ajax.put("belongWards", sysDeptBQs);
return ajax;
}
--
Gitblit v1.9.3