From 291a72bf35e2d39b816abc0ebf085cfa9da3ee06 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 23 九月 2025 14:11:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalServiceImpl.java
index 2d70894..f1d9a1a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalServiceImpl.java
@@ -2,13 +2,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
-import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.core.domain.entity.TDept;
-import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.system.mapper.OaApprovalMapper;
import com.ruoyi.system.mapper.TDeptMapper;
import com.ruoyi.system.model.OaApproval;
import com.ruoyi.system.query.ApprovalListQuery;
+import com.ruoyi.system.query.ApprovalNodeListQuery;
import com.ruoyi.system.service.OaApprovalService;
import com.ruoyi.system.vo.system.ApprovalVO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,11 +39,15 @@
List<ApprovalVO> list = this.baseMapper.pageList(query,pageInfo);
for (ApprovalVO approvalVO : list) {
StringBuilder deptName = new StringBuilder();
- for (String deptId : approvalVO.getDeptIds().split(",")) {
- String orDefault = deptMaps.getOrDefault(Integer.parseInt(deptId), "");
- deptName.append(orDefault).append(",");
+ if(StringUtils.hasLength(approvalVO.getDeptIds())&&approvalVO.getDeptIds().equals("-1")){
+ approvalVO.setDeptName("所有部门");
+ }else{
+ for (String deptId : approvalVO.getDeptIds().split(",")) {
+ String orDefault = deptMaps.getOrDefault(Integer.parseInt(deptId), "");
+ deptName.append(orDefault).append(",");
+ }
+ approvalVO.setDeptName(deptName.substring(0,deptName.length()-1));
}
- approvalVO.setDeptName(deptName.substring(0,deptName.length()-1));
}
pageInfo.setRecords(list);
return pageInfo;
--
Gitblit v1.7.1