From da026a34bcc97b2eb49607a3b02d94d8f683f997 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java
index 070221f..43e80cd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java
@@ -2,6 +2,9 @@
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -44,9 +47,13 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呮鏌ユ楠岃褰曞瓙鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:operation:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody BaseDictOperation baseDictOperation) {
startPage();
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ baseDictOperation.setOrgid(user.getOrgid());
List<BaseDictOperation> list = baseDictOperationService.selectBaseDictOperationList(baseDictOperation);
return getDataTable(list);
}
@@ -80,7 +87,8 @@
@ApiOperation("鏂板鎮ｈ�呮鏌ユ楠岃褰曞瓙")
//@PreAuthorize("@ss.hasPermi('smartor:operation:add')")
@Log(title = "鎮ｈ�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody BaseDictOperation baseDictOperation) {
return toAjax(baseDictOperationService.insertBaseDictOperation(baseDictOperation));
}
@@ -91,7 +99,8 @@
@ApiOperation("淇敼鎮ｈ�呮鏌ユ楠岃褰曞瓙")
//@PreAuthorize("@ss.hasPermi('smartor:operation:edit')")
@Log(title = "鎮ｈ�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseDictOperation baseDictOperation) {
return toAjax(baseDictOperationService.updateBaseDictOperation(baseDictOperation));
}
--
Gitblit v1.9.3