From 60afc1c228318d136a273cd0b389217f87583277 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 十月 2025 11:29:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetMainController.java | 80 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 78 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetMainController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetMainController.java
index 54c123d..4ade46e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetMainController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetMainController.java
@@ -1,6 +1,20 @@
package com.ruoyi.web.controller.api;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.constants.AssetDeptConstant;
+import com.ruoyi.system.query.AssetMainPageQuery;
+import com.ruoyi.system.service.AssetMainService;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.vo.asset.AssetMainPageVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -9,12 +23,74 @@
* 资产主表 前端控制器
* </p>
*
- * @author WuGuanFengYue
- * @since 2025-09-15
+ * 用于资产主数据的查询，新增：查询审批通过的资产分页列表接口
*/
+@Api(tags = {"资产-资产主数据相关接口"})
+@Validated
@RestController
@RequestMapping("/asset-main")
+@RequiredArgsConstructor
public class AssetMainController {
+ private final AssetMainService assetMainService;
+ private final ISysUserService sysUserService;
+
+ @ApiOperation("获取审批通过且可用的资产分页列表（排除已领用、已处置、未归还借用）")
+ @PostMapping("/page-list")
+ public R<IPage<AssetMainPageVO>> getApprovedAssetPageList(@RequestBody AssetMainPageQuery pageQuery) {
+ // 数据权限：超级管理员/资产管理部查看所有数据，其他部门查看当前及下级部门的数据
+ Long userId = SecurityUtils.getUserId();
+ boolean isAdmin = SecurityUtils.isAdmin(userId);
+
+ if (!isAdmin) {
+ try {
+ // 获取当前用户的部门名称
+ String deptName = sysUserService.selectUserById(userId).getDept().getDeptName();
+
+ // 非超级管理员且非资产管理部，设置部门权限
+ if (!AssetDeptConstant.ASSET_DEPARTMENT_NAME.equals(deptName)) {
+ pageQuery.setDeptId(Integer.valueOf(SecurityUtils.getLoginUser().getDeptId()));
+ }
+ } catch (Exception e) {
+ // 如果获取部门信息失败，默认设置部门权限
+ try {
+ pageQuery.setDeptId(Integer.valueOf(SecurityUtils.getLoginUser().getDeptId()));
+ } catch (Exception ex) {
+ // ignore parse, leave null if cannot parse
+ }
+ }
+ }
+ IPage<AssetMainPageVO> page = assetMainService.getApprovedPageList(pageQuery);
+ return R.ok(page);
+ }
+
+ @ApiOperation("获取已入库的资产列表")
+ @PostMapping("/page-list-all")
+ public R<IPage<AssetMainPageVO>> getAssetPageList(@RequestBody AssetMainPageQuery pageQuery) {
+ // 数据权限：超级管理员/资产管理部查看所有数据，其他部门查看当前及下级部门的数据
+ Long userId = SecurityUtils.getUserId();
+ boolean isAdmin = SecurityUtils.isAdmin(userId);
+
+ if (!isAdmin) {
+ try {
+ // 获取当前用户的部门名称
+ String deptName = sysUserService.selectUserById(userId).getDept().getDeptName();
+
+ // 非超级管理员且非资产管理部，设置部门权限
+ if (!AssetDeptConstant.ASSET_DEPARTMENT_NAME.equals(deptName)) {
+ pageQuery.setDeptId(Integer.valueOf(SecurityUtils.getLoginUser().getDeptId()));
+ }
+ } catch (Exception e) {
+ // 如果获取部门信息失败，默认设置部门权限
+ try {
+ pageQuery.setDeptId(Integer.valueOf(SecurityUtils.getLoginUser().getDeptId()));
+ } catch (Exception ex) {
+ // ignore parse, leave null if cannot parse
+ }
+ }
+ }
+ IPage<AssetMainPageVO> page = assetMainService.getAssetPageList(pageQuery);
+ return R.ok(page);
+ }
}
--
Gitblit v1.7.1