From 861b8c51cf42864fde663391eeb73e4fc61d3848 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 07 一月 2026 17:13:45 +0800
Subject: [PATCH] 【市一】登录bug处理
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 8 ++-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 4 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java | 5 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java | 7 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java | 8 ++-
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 3 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java | 7 ++-
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java | 7 ++-
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java | 8 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java | 7 ++-
12 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
index 4eb699d..02f63c2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
@@ -3,6 +3,7 @@
import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
import com.aliyun.teaopenapi.models.Config;
import com.github.pagehelper.ISelect;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -119,8 +120,8 @@
@ApiOperation("淇敼闂嵎")
//@PreAuthorize("@ss.hasPermi('smartor:svyTemplate:edit')")
@Log(title = "闂嵎", businessType = BusinessType.UPDATE)
-@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("/edit")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTemplate svyLibTemplate) {
return toAjax(svyLibTemplateService.updateSvyLibTemplate(svyLibTemplate));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java
index ff0714c..ae78459 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -74,7 +75,7 @@
@ApiOperation("鏂板妯℃澘绉戝鍏宠仈")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.INSERT)
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("/add")
+ @PostMapping("/add")
public AjaxResult add(@RequestBody List<TemplateDept> templateDepts) {
SysUser user = getLoginUser().getUser();
return toAjax(templateDeptService.insertTemplateDept(templateDepts,user.getGuid()));
@@ -86,8 +87,8 @@
@ApiOperation("淇敼妯℃澘绉戝鍏宠仈")
//@PreAuthorize("@ss.hasPermi('smartor:dept:edit')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.UPDATE)
-@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("/edit")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody TemplateDept templateDept) {
return toAjax(templateDeptService.updateTemplateDept(templateDept));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
index 610eed3..7c41d3b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -57,7 +58,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:smsaccount:list')")
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("list")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody BaseSmsaccount baseSmsaccount) {
startPage();
List<BaseSmsaccount> list = baseSmsaccountService.selectBaseSmsaccountList(baseSmsaccount);
@@ -100,8 +101,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:smsaccount:edit')")
@Log(title = "鐭俊璐﹀彿", businessType = BusinessType.UPDATE)
-@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("/edit")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseSmsaccount baseSmsaccount) {
return toAjax(baseSmsaccountService.updateBaseSmsaccount(baseSmsaccount));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
index 4d4ba96..aad9a65 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -91,7 +93,7 @@
//@PreAuthorize("@ss.hasPermi('system:config:add')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT)
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("/add")
+ @PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysConfig config)
{
if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
@@ -107,8 +109,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:config:edit')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
-@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("/edit")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysConfig config)
{
if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
index a7f8cac..19eae8e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -85,7 +86,7 @@
//@PreAuthorize("@ss.hasPermi('system:dept:add')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.INSERT)
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("/add")
+ @PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysDept dept)
{
if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
@@ -102,8 +103,8 @@
@ApiOperation("淇敼閮ㄩ棬")
//@PreAuthorize("@ss.hasPermi('system:dept:edit')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.UPDATE)
-@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("/edit")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysDept dept)
{
Long deptId = dept.getDeptId();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
index 510004d..1b42597 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@@ -3,6 +3,8 @@
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -89,7 +91,7 @@
//@PreAuthorize("@ss.hasPermi('system:dict:add')")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT)
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("/add")
+ @PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysDictData dict)
{
dict.setCreateBy(getUsername());
@@ -101,8 +103,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:dict:edit')")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
-@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("/edit")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysDictData dict)
{
dict.setUpdateBy(getUsername());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
index ca14513..e850e65 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -70,7 +72,7 @@
//@PreAuthorize("@ss.hasPermi('system:dict:add')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.INSERT)
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("/add")
+ @PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysDictType dict)
{
if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
@@ -86,8 +88,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:dict:edit')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.UPDATE)
-@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("/edit")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysDictType dict)
{
if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
index 5df2145..dc80f7e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
@@ -63,7 +64,7 @@
//@PreAuthorize("@ss.hasPermi('system:notice:add')")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.INSERT)
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("/add")
+ @PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysNotice notice) {
notice.setCreateBy(getUsername());
return toAjax(noticeService.insertNotice(notice));
@@ -74,8 +75,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:notice:edit')")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.UPDATE)
-@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("/edit")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysNotice notice) {
notice.setUpdateBy(getUsername());
return toAjax(noticeService.updateNotice(notice));
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
index a25521d..943d96c 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index e85f781..f89a766 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -53,7 +53,7 @@
* @param userName 鐢ㄦ埛鍚�
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
- public SysUser selectUserByUserNameByCondition(@Param("userName") String userName, @Param("deptId") String deptId);
+ public SysUser selectUserByUserNameByCondition(@Param("userName") String userName, @Param("orgid") String orgid, @Param("deptId") String deptId);
/**
* 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index bc4fc24..7c84330 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -178,7 +178,7 @@
@Override
public SysUser selectUserByUserName2(String userName) {
String[] split = userName.split("&");
- SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], null);
+ SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], null);
//鑾峰彇褰撳墠鐧婚檰浜虹殑鏈烘瀯鍜岄櫌鍖�
SysUserOrg sysUserOrg = new SysUserOrg();
@@ -298,7 +298,7 @@
if (split[2].contains("null")) {
split[2] = null;
}
- SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[2]);
+ SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], split[2]);
//鑾峰彇褰撳墠鐧婚檰浜虹殑鏈烘瀯鍜岄櫌鍖�
SysUserOrg sysUserOrg = new SysUserOrg();
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index b61d615..3b5a68e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -306,6 +306,9 @@
<if test="userName != null and userName != ''">
AND u.user_name = #{userName}
</if>
+ <if test="orgid != null and orgid != ''">
+ AND u.orgid = #{orgid}
+ </if>
<if test="deptId != null and deptId != ''">
AND u.dept_id = #{deptId}
</if>
--
Gitblit v1.9.3