From c80135e5c3f7bfab96ba558a910a06f1e587c53c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:14:04 +0800
Subject: [PATCH] 1.新增@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") 2.将新增orgid的拦截器关掉 3.登陆新增campusid
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java
index d3c54ca..ac422b4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java
@@ -1,21 +1,24 @@
package com.ruoyi.web.controller.smartor;
+import com.github.pagehelper.ISelect;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.HeLibrary;
import com.smartor.domain.HeLibraryVO;
import com.smartor.service.IHeLibraryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -39,11 +42,25 @@
*/
@ApiOperation("鏌ヨ瀹ｆ暀璧勬枡搴撳垪琛�")
//@PreAuthorize("@ss.hasPermi('system:library:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody HeLibrary heLibrary) {
- startPage();
+ PageUtils.startPageByPost(heLibrary.getPageNum(), heLibrary.getPageSize());
List<HeLibrary> list = heLibraryService.selectHeLibraryList(heLibrary);
- return getDataTable(list);
+ if (CollectionUtils.isNotEmpty(list)) {
+ //鑾峰彇total
+ long total = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ heLibrary.setPageNum(null);
+ heLibrary.setPageSize(null);
+ heLibraryService.selectHeLibraryList(heLibrary);
+ }
+ });
+
+ return getDataTable2(total, list);
+ }
+ return getDataTable2(0, list);
}
/**
@@ -72,7 +89,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:library:add')")
@Log(title = "瀹ｆ暀璧勬枡搴�", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody HeLibrary heLibrary) {
SysUser user = getLoginUser().getUser();
heLibrary.setOrgid(user.getOrgid());
@@ -84,6 +102,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:library:edit')")
@Log(title = "瀹ｆ暀璧勬枡搴�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody HeLibrary heLibrary) {
return toAjax(heLibraryService.updateHeLibrary(heLibrary));
@@ -120,6 +139,7 @@
*/
@ApiOperation("鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢")
@PostMapping("/selectInfoByCondition")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
public AjaxResult selectInfoByCondition(@RequestBody HeLibrary heLibrary) {
if (ObjectUtils.isEmpty(heLibrary)) {
throw new BaseException("鏌ヨ妯℃澘璇︽儏鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�");
@@ -132,6 +152,7 @@
*/
@ApiOperation("鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢(灏忕▼搴忎笓鐢�)")
@PostMapping("/selectInfoByConditionXCH")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
public AjaxResult selectInfoByConditionXCH(@RequestBody HeLibrary heLibrary) {
if (ObjectUtils.isEmpty(heLibrary)) {
throw new BaseException("鏌ヨ妯℃澘璇︽儏鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�");
--
Gitblit v1.9.3