From f6760448428b0a11aebab4ee281023532e4f61d7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 27 十月 2025 19:53:56 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/resources/mapper/system/AssetAdMapper.xml | 22 +++++-----
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java | 8 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java | 23 ++++++++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowAuditController.java | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetHouseInspectionItemController.java | 3 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 35 +++++++++++++++++
ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml | 5 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java | 21 +++++++---
ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml | 2
9 files changed, 91 insertions(+), 29 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetHouseInspectionItemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetHouseInspectionItemController.java
index 35f9633..d7c7a2a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetHouseInspectionItemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetHouseInspectionItemController.java
@@ -139,7 +139,8 @@
Map<Integer, String> map = assetPropertyExtService.lambdaQuery().isNotNull(AssetPropertyExt::getRoomNumber).list()
.stream().collect(Collectors.toMap(AssetPropertyExt::getAssetMainId, AssetPropertyExt::getRoomNumber));
Long userId = tokenService.getLoginUser().getUserId();
- if (!SecurityUtils.isAdmin(userId)) {
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ if (!SecurityUtils.isAdmin(userId) || sysUser.getRoleId() != 1) {
if (dept.getDeptName().contains("资产管理") || dept.getDeptName().contains("董事长") || dept.getDeptName().contains("总经理")) {
List<AssetMain> list = assetMainService.lambdaQuery()
.eq(AssetMain::getAssetTypeId, assetType.getId())
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
index 8258523..be6f3ff 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.TDept;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.TokenService;
@@ -59,6 +60,8 @@
@Autowired
private TokenService tokenService;
@Autowired
+ private ISysUserService sysUserService;
+ @Autowired
private TDeptService deptService;
@ApiOperation("获取资产类型树形数据")
@@ -95,7 +98,8 @@
TDept dept = deptService.getById(deptId);
List<Integer> deptIds = deptService.getAllSubDeptIds(deptId);
Long userId = tokenService.getLoginUser().getUserId();
- if (!SecurityUtils.isAdmin(userId)) {
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ if (!SecurityUtils.isAdmin(userId) || sysUser.getRoleId() != 1) {
if (dept.getDeptName().contains("资产管理")||dept.getDeptName().contains("董事长")||dept.getDeptName().contains("总经理")) {
// 可以查询所有数据
query.setDeptIds(new ArrayList<>());
@@ -107,7 +111,8 @@
}
}
}else{
-
+ List<Integer> deptIdsAll = deptService.list().stream().map(TDept::getId).collect(Collectors.toList());
+ query.setDeptIds(deptIdsAll);
}
return R.ok(assetTypeService.pageList(query));
@@ -120,7 +125,8 @@
TDept dept = deptService.getById(tokenService.getLoginUser().getDeptId());
List<Integer> deptIds = deptService.getAllSubDeptIds(deptId);
Long userId = tokenService.getLoginUser().getUserId();
- if (!SecurityUtils.isAdmin(userId)) {
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ if (!SecurityUtils.isAdmin(userId) || sysUser.getRoleId() != 1) {
if (dept.getDeptName().contains("资产管理")||dept.getDeptName().contains("董事长")||dept.getDeptName().contains("总经理")) {
// 可以查询所有数据
query.setDeptIds(new ArrayList<>());
@@ -145,7 +151,8 @@
TDept dept = deptService.getById(tokenService.getLoginUser().getDeptId());
List<Integer> deptIds = deptService.getAllSubDeptIds(deptId);
Long userId = tokenService.getLoginUser().getUserId();
- if (!SecurityUtils.isAdmin(userId)) {
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ if (!SecurityUtils.isAdmin(userId) || sysUser.getRoleId() != 1) {
if (dept.getDeptName().contains("资产管理")||dept.getDeptName().contains("董事长")||dept.getDeptName().contains("总经理")) {
// 可以查询所有数据
query.setDeptIds(new ArrayList<>());
@@ -206,7 +213,8 @@
TDept dept = deptService.getById(tokenService.getLoginUser().getDeptId());
List<Integer> deptIds = deptService.getAllSubDeptIds(deptId);
Long userId = tokenService.getLoginUser().getUserId();
- if (!SecurityUtils.isAdmin(userId)) {
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ if (!SecurityUtils.isAdmin(userId) || sysUser.getRoleId() != 1) {
if (dept.getDeptName().contains("资产管理")||dept.getDeptName().contains("董事长")||dept.getDeptName().contains("总经理")) {
// 可以查询所有数据
query.setDeptIds(new ArrayList<>());
@@ -272,7 +280,8 @@
TDept dept = deptService.getById(tokenService.getLoginUser().getDeptId());
List<Integer> deptIds = new ArrayList<>();
Long userId = tokenService.getLoginUser().getUserId();
- if (!SecurityUtils.isAdmin(userId)) {
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ if (!SecurityUtils.isAdmin(userId) || sysUser.getRoleId() != 1) {
if (dept.getDeptName().contains("资产管理")||dept.getDeptName().contains("拆迁")||dept.getDeptName().contains("安置")
||dept.getDeptName().contains("董事长")||dept.getDeptName().contains("总经理")) {
// 可以查询所有数据
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java
index 6b3f8c9..6eb5e5d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.SetDeptDTO;
import com.ruoyi.system.model.OaApproval;
@@ -30,7 +31,7 @@
*/
@RestController
@RequestMapping("/oa-approval")
-@Api(tags ="审批流程设计")
+@Api(tags = "审批流程设计")
public class OaApprovalController {
@Resource
private OaApprovalService oaApprovalService;
@@ -45,8 +46,9 @@
@ApiOperation("流程设计分页列表")
@PostMapping("/pageList")
public R<PageInfo<ApprovalVO>> pageList(@RequestBody ApprovalListQuery query) {
- return R.ok( oaApprovalService.pageList(query));
+ return R.ok(oaApprovalService.pageList(query));
}
+
@ApiOperation("流程设计不分页列表")
@PostMapping("/listAll")
public R<List<OaApproval>> listAll() {
@@ -54,28 +56,35 @@
List<OaApproval> approvals = oaApprovalService.list();
Long userId = tokenService.getLoginUser().getUserId();
SysUser sysUser = sysUserService.selectUserById(userId);
+
+ if (SecurityUtils.isAdmin(userId) || sysUser.getRoleId() == 1) {
+ return R.ok(approvals);
+ }
+
String deptId = sysUser.getDeptId();
for (OaApproval approval : approvals) {
- if (approval.getDeptIds().equals("-1")){
+ if (approval.getDeptIds().equals("-1")) {
res.add(approval);
- }else{
+ } else {
for (String s : approval.getDeptIds().split(",")) {
- if (s.equals(deptId)){
+ if (s.equals(deptId)) {
res.add(approval);
}
}
}
}
- return R.ok(res );
+ return R.ok(res);
}
+
@ApiOperation(value = "启用禁用")
@GetMapping(value = "/updateStatus")
- public R updateStatus(Integer id ) {
+ public R updateStatus(Integer id) {
OaApproval approval = oaApprovalService.getById(id);
approval.setStatus(!approval.getStatus());
oaApprovalService.updateById(approval);
return R.ok();
}
+
@ApiOperation(value = "设置使用部门")
@PostMapping(value = "/setDept")
public R setDept(@RequestBody SetDeptDTO dto) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowAuditController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowAuditController.java
index 3ebd6e8..969fa12 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowAuditController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowAuditController.java
@@ -650,6 +650,7 @@
saveAssetRecord(0,ApprovalTypeEnum.RETURN.getDesc(),back.stream().map(OaApprovalApplicationAssetItem::getAssetMainId)
.collect(Collectors.toList()));
+ break;
case 10:
OaApprovalApplicationDispose approvalApplicationDispose = approvalApplicationDisposeService.lambdaQuery()
.eq(OaApprovalApplicationDispose::getApprovalApplicationId, approvalApplications.getId())
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 94295e0..bf43fe2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -1,4 +1,5 @@
package com.ruoyi.web.controller.system;
+import java.util.Date;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
@@ -236,7 +237,39 @@
Map<String, TDept> deptMap = tDeptService.list().stream().collect(Collectors.toMap(TDept::getDeptName, e -> e));
Map<String, SysRole> roleMap = roleService.selectRoleAll().stream().collect(Collectors.toMap(SysRole::getRoleName, e -> e));
for (EmployeeImportExcel employeeExcel : employeeExcelList) {
- try {
+ EmployeeImportExcel employeeImportExcel = new EmployeeImportExcel();
+ String nickName = employeeImportExcel.getNickName();
+ String sex = employeeImportExcel.getSex();
+ String idCard = employeeImportExcel.getIdCard();
+ Integer age = employeeImportExcel.getAge();
+ String politicalOutlook = employeeImportExcel.getPoliticalOutlook();
+ Date participationTime = employeeImportExcel.getParticipationTime();
+ Date companyTime = employeeImportExcel.getCompanyTime();
+ String firstDegree = employeeImportExcel.getFirstDegree();
+ String firstCollege = employeeImportExcel.getFirstCollege();
+ String firstMajor = employeeImportExcel.getFirstMajor();
+ String highestDegree = employeeImportExcel.getHighestDegree();
+ String highestCollege = employeeImportExcel.getHighestCollege();
+ String highestMajor = employeeImportExcel.getHighestMajor();
+ String department = employeeImportExcel.getDepartment();
+ String position = employeeImportExcel.getPosition();
+ Date positionTime = employeeImportExcel.getPositionTime();
+ String phoneNumber = employeeImportExcel.getPhoneNumber();
+ String organization = employeeImportExcel.getOrganization();
+ String roleName = employeeImportExcel.getRoleName();
+ if (!StringUtils.isEmpty(nickName)
+ &&!StringUtils.isEmpty(sex)
+ &&!StringUtils.isEmpty(idCard)
+ &&!StringUtils.isEmpty(phoneNumber)
+ &&!StringUtils.isEmpty(organization)
+ &&!StringUtils.isEmpty(roleName)
+ &&!StringUtils.isEmpty(department)
+ &&!StringUtils.isEmpty(highestCollege)
+ ){
+ // 到最后一行了
+ break;
+ }
+ try {
// 数据验证
if (StringUtils.isEmpty(employeeExcel.getNickName())) {
errorMessages.add("第" + (successCount + failCount + 1) + "行：姓名为空");
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java
index 2e25429..f45f5fa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java
@@ -486,7 +486,15 @@
PageInfo<AssetStatisticsDetailVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<AssetStatisticsDetailVO> list = this.baseMapper.pageListInventoryDetail(query,pageInfo);
List<AssetType> assetTypes = assetTypeService.list();
+ Map<Integer, AssetType> typeMap = assetTypes.stream().collect(Collectors.toMap(AssetType::getId, e -> e));
for (AssetStatisticsDetailVO assetStatisticsDetailVO : list) {
+ AssetType child = typeMap.get(assetStatisticsDetailVO.getAssetTypeId());
+ if (child!=null){
+ AssetType parent = typeMap.get(child.getParentId());
+ if (parent!=null){
+ assetStatisticsDetailVO.setAssetTypeName(parent.getTypeName()+">"+child.getTypeName());
+ }
+ }
Integer type = assetStatisticsDetailVO.getType();
if (type==0){
String typeName = "入库";
diff --git a/ruoyi-system/src/main/resources/mapper/system/AssetAdMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AssetAdMapper.xml
index 42946b4..85306a6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/AssetAdMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AssetAdMapper.xml
@@ -26,17 +26,17 @@
</sql>
<select id="getPageList" resultType="com.ruoyi.system.vo.asset.AssetAdVO">
SELECT aa.id,
- asset_name,
- asset_code,
- dept_id,
- asset_type_id,
- location,
- rental_type,
- asset_status,
- remarks,
- attachment_urls,
- create_time,
- create_by
+ aa.asset_name,
+ aa.asset_code,
+ aa.dept_id,
+ aa.asset_type_id,
+ aa.location,
+ aa.rental_type,
+ aa.asset_status,
+ aa.remarks,
+ aa.attachment_urls,
+ aa.create_time,
+ aa.create_by
FROM asset_ad aa LEFT JOIN t_dept td ON aa.dept_id = td.id
<where>
aa.disabled = 0
diff --git a/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml
index addde14..7e03785 100644
--- a/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml
@@ -137,7 +137,7 @@
AND t2.category = #{query.category}
</if>
<if test="query.assetTypeIdSecond != null and query.assetTypeIdSecond!=''">
- AND t2.asset_type_id = #{query.category}
+ AND t2.asset_type_id = #{query.assetTypeIdSecond}
</if>
<if test="query.assetStatus != null and query.assetStatus!=''">
diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
index 7d28d3d..49ce130 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
@@ -82,16 +82,17 @@
<select id="getBorrowDetailByApplicationCode"
resultType="com.ruoyi.system.vo.asset.OaApprovalApplicationAssetDetailVO"
parameterType="java.lang.Long">
- SELECT
+ SELECT DISTINCT
oaa.*,
oaaa.title,
oaaa.asset_type_id,
oaaa.operate_time
FROM
oa_approval_applications oaa
- LEFT JOIN oa_approval_application_asset oaaa ON oaa.id = oaaa.approval_application_id
+ LEFT JOIN oa_approval_application_asset oaaa ON oaa.id = oaaa.approval_application_id AND oaaa.return_status != 2
LEFT JOIN oa_approval_application_asset borrow_oaaa ON borrow_oaaa.borrow_application_id = oaa.id
AND borrow_oaaa.return_status != 2
+
WHERE
oaa.applicant_user_id = #{userId}
AND oaa.approval_status = '${@com.ruoyi.system.emums.ApprovalStatusEnum@PASSED.getCode()}'
--
Gitblit v1.7.1