From d44ecb3072757aa33508a1a22d8ec36afb7db808 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 17 三月 2026 17:26:02 +0800
Subject: [PATCH] 【丽水】ssoLoginLyra 接口对接调整 免SSL 登录
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java
index c51bc73..3f9b93c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java
@@ -1,14 +1,17 @@
package com.ruoyi.web.controller.smartor;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.PageUtils;
import com.smartor.domain.HeLibraryAssort;
import com.smartor.domain.HeLibraryAssortVO;
import com.smartor.service.IHeLibraryAssortService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +23,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
@@ -45,10 +49,10 @@
@ApiOperation("鏌ヨ瀹ｆ暀鍒嗙被鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:assort:list')")
@PostMapping("/selectHeLibraryAssortList")
- public TableDataInfo list(@RequestBody HeLibraryAssort heLibraryAssort) {
- startPage();
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ public Map<String, Object> list(@RequestBody HeLibraryAssort heLibraryAssort) {
List<HeLibraryAssortVO> list = heLibraryAssortService.selectHeLibraryAssortList(heLibraryAssort);
- return getDataTable(list);
+ return getDataTable3(CollectionUtils.isNotEmpty(list) ? list.size() : 0, list);
}
/**
@@ -80,10 +84,9 @@
@ApiOperation("鏂板瀹ｆ暀鍒嗙被")
//@PreAuthorize("@ss.hasPermi('smartor:assort:add')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody HeLibraryAssort heLibraryAssort) {
- SysUser user = getLoginUser().getUser();
- heLibraryAssort.setOrgid(user.getOrgid());
return toAjax(heLibraryAssortService.insertHeLibraryAssort(heLibraryAssort));
}
@@ -94,9 +97,8 @@
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.INSERT)
@ApiOperation("鏂板瀹ｆ暀鍒嗙被璇︽儏鏍�")
@PostMapping("/addtree")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
public AjaxResult addtree(@RequestBody HeLibraryAssortVO heLibraryAssortVO) {
- SysUser user = getLoginUser().getUser();
- heLibraryAssortVO.setOrgid(user.getOrgid());
return toAjax(heLibraryAssortService.insertHeLibraryAssortTree(heLibraryAssortVO));
}
@@ -106,6 +108,7 @@
@ApiOperation("淇敼瀹ｆ暀鍒嗙被")
//@PreAuthorize("@ss.hasPermi('smartor:assort:edit')")
@Log(title = "瀹ｆ暀鍒嗙被", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody HeLibraryAssort heLibraryAssort) {
return toAjax(heLibraryAssortService.updateHeLibraryAssort(heLibraryAssort));
--
Gitblit v1.9.3