Selaa lähdekoodia

wuzhen update

wuzhen 1 vuosi sitten
vanhempi
commit
5b7fb1d5ab

+ 1 - 1
backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwApprovalRecordServiceImpl.java

@@ -464,7 +464,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
     public List<CwApprovalRecordVo> queryLeaderApprovedApprovals() {
     public List<CwApprovalRecordVo> queryLeaderApprovedApprovals() {
         Long currentUserId = LoginHelper.getUserId();
         Long currentUserId = LoginHelper.getUserId();
         log.info("🔍 查询学院领导已审批申报列表,当前用户ID={}", currentUserId);
         log.info("🔍 查询学院领导已审批申报列表,当前用户ID={}", currentUserId);
-        return baseMapper.selectByApproverAndNode(currentUserId, "leader_approve", "complete");
+        return baseMapper.selectByApproverAndNode(currentUserId, "leader_approve", "approved");
     }
     }
 
 
     /**
     /**

+ 2 - 2
backend/ruoyi-modules/ruoyi-cw/src/main/resources/mapper/CwApprovalRecordMapper.xml

@@ -139,11 +139,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by ar.create_time desc
         order by ar.create_time desc
     </select>
     </select>
 
 
-    <!-- 查询财务审批节点的已审批记录(completed和rejected状态) -->
+    <!-- 查询财务审批节点的已审批记录(approved和rejected状态) -->
     <select id="selectFinanceApprovedRecords" resultMap="CwApprovalRecordVoResult">
     <select id="selectFinanceApprovedRecords" resultMap="CwApprovalRecordVoResult">
         <include refid="selectCwApprovalRecordVo"/>
         <include refid="selectCwApprovalRecordVo"/>
         where ar.node_code = 'finance_approve'
         where ar.node_code = 'finance_approve'
-          and ar.node_status in ('completed', 'rejected')
+          and ar.node_status in ('approved', 'rejected')
         order by ar.end_time desc
         order by ar.end_time desc
     </select>
     </select>