资产管理数据权限修改

mitao

1 天以前 50ee6ccb8d8036ffaa2aabb4e4999c14a05b45a3

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationAssetController.java

@@ -6,24 +6,30 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.constants.AssetDeptConstant;
import com.ruoyi.system.dto.asset.OaApprovalApplicationAssetReceiveDTO;
import com.ruoyi.system.dto.asset.OaApprovalApplicationAssetReturnDTO;
import com.ruoyi.system.query.OaApprovalApplicationAssetPageQuery;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.OaApprovalApplicationAssetService;
import com.ruoyi.system.vo.asset.OaApprovalApplicationAssetPageVO;
import com.ruoyi.system.vo.asset.AssetMainVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationAssetDetailVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationAssetPageVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
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;

import javax.validation.Valid;
import java.util.List;

/**
 * <p>
@@ -38,6 +44,7 @@
public class OaApprovalApplicationAssetController {

    private final OaApprovalApplicationAssetService oaApprovalApplicationAssetService;
    private final ISysUserService sysUserService;

    @ApiOperation("提交资产领用申请")
    @PostMapping("/submit-receive")
@@ -50,14 +57,26 @@
    @ApiOperation("获取资产领用申请分页列表")
    @PostMapping("/page-list")
    public R<IPage<OaApprovalApplicationAssetPageVO>> getReceivePageList(@RequestBody OaApprovalApplicationAssetPageQuery pageQuery) {
        // 数据权限：非管理员仅能查看本部门
        // 数据权限：超级管理员/资产管理部查看所有数据，其他部门查看当前及下级部门的数据
        Long userId = SecurityUtils.getUserId();
        boolean isAdmin = SecurityUtils.isAdmin(userId);

        if (!isAdmin) {
            try {
                pageQuery.setDeptId(Integer.valueOf(SecurityUtils.getDeptId()));
                // 获取当前用户的部门名称
                String deptName = sysUserService.selectUserById(userId).getDept().getDeptName();

                // 非超级管理员且非资产管理部，设置部门权限
                if (!AssetDeptConstant.ASSET_DEPARTMENT_NAME.equals(deptName)) {
                    pageQuery.setDeptId(Integer.valueOf(SecurityUtils.getLoginUser().getDeptId()));
                }
            } catch (Exception e) {
                // ignore parse, leave null if cannot parse
                // 如果获取部门信息失败，默认设置部门权限
                try {
                    pageQuery.setDeptId(Integer.valueOf(SecurityUtils.getLoginUser().getDeptId()));
                } catch (Exception ex) {
                    // ignore parse, leave null if cannot parse
                }
            }
        }
        IPage<OaApprovalApplicationAssetPageVO> page = oaApprovalApplicationAssetService.getReceivePageList(pageQuery);
@@ -96,4 +115,103 @@
        return R.ok(page);
    }

    @ApiOperation("获取资产借用详情")
    @GetMapping("/detail/borrow/{id}")
    public R<OaApprovalApplicationAssetDetailVO> getBorrowDetail(@ApiParam(name = "id", value = "审批单ID", required = true) @PathVariable Integer id) {
        OaApprovalApplicationAssetDetailVO detail = oaApprovalApplicationAssetService.getBorrowDetail(id);
        return R.ok(detail);
    }

    @ApiOperation("查询当前登录用户提交的借用申请记录列表")
    @GetMapping("/borrow-list")
    public R<List<OaApprovalApplicationAssetDetailVO>> getBorrowDetailByApplicationCode() {
        List<OaApprovalApplicationAssetDetailVO> detail = oaApprovalApplicationAssetService.getBorrowDetailByApplicationCode();
        return R.ok(detail);
    }

    @ApiOperation(("根据借用单ID获取借用资产列表"))
    @GetMapping("/borrow-detail-list/{id}")
    public R<List<AssetMainVO>> getBorrowDetailList(@ApiParam(name = "id", value = "审批单ID", required = true) @PathVariable Integer id) {
        List<AssetMainVO> list = oaApprovalApplicationAssetService.getBorrowDetailList(id);
        return R.ok(list);
    }

    @ApiOperation("提交资产归还申请")
    @PostMapping("/submit-return")
    @Log(title = "资产归还申请-提交", businessType = BusinessType.INSERT)
    public R<Void> submitReturn(@Valid @RequestBody OaApprovalApplicationAssetReturnDTO dto) {
        oaApprovalApplicationAssetService.submitReturn(dto);
        return R.ok();
    }

    @ApiOperation("获取资产归还申请分页列表")
    @PostMapping("/page-return-list")
    public R<IPage<OaApprovalApplicationAssetPageVO>> getReturnPageList(@RequestBody OaApprovalApplicationAssetPageQuery 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<OaApprovalApplicationAssetPageVO> page = oaApprovalApplicationAssetService.getReturnPageList(pageQuery);
        return R.ok(page);
    }

    @ApiOperation("获取资产归还提醒分页列表")
    @PostMapping("/page-return-notify-list")
    public R<IPage<OaApprovalApplicationAssetPageVO>> getReturnNotifyPageList(@RequestBody OaApprovalApplicationAssetPageQuery 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<OaApprovalApplicationAssetPageVO> page = oaApprovalApplicationAssetService.getReturnNotifyPageList(pageQuery);
        return R.ok(page);
    }

    @ApiOperation("获取资产归还详情")
    @GetMapping("/detail/return/{id}")
    public R<OaApprovalApplicationAssetDetailVO> getReturnDetail(@ApiParam(name = "id", value = "审批单ID", required = true) @PathVariable Integer id) {
        OaApprovalApplicationAssetDetailVO detail = oaApprovalApplicationAssetService.getReturnDetail(id);
        return R.ok(detail);
    }
    @ApiOperation("删除/领用/借用/归还申请")
    @DeleteMapping("/{id}")
    public R<?> delete(@ApiParam(name = "id",value = "审批记录ID",required = true) @PathVariable Integer id){
        oaApprovalApplicationAssetService.deleteByApplicationId(id);
        return R.ok();
    }
}