diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index 521c6833..5b3c6e9b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -2505,8 +2505,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (flagForDepartmentHeadPass || flagForOpenDepository == 2) { map.put("state", userByPort.getName() + "审核通过"); map.put("depositoryManagerPass", 4); - String departmenthead = recordP.getDepartmenthead(); - if (departmenthead == null) { + if ("0".equals(departmentheadTime)) { map.put("departmenthead", userByPort.getId()); map.put("departmentheadPass", 1); map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime)); @@ -2522,8 +2521,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (flagForDepartmentHeadPass || flagForOpenDepository == 2) { map.put("state", userByPort.getName() + "审核未通过"); map.put("depositoryManagerPass", 4); - String departmenthead = recordP.getDepartmenthead(); - if (departmenthead == null) { + if ("0".equals(departmentheadTime)) { map.put("departmentheadPass", 2); map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime)); diff --git a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java index 6267775c..d25f2243 100644 --- a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java @@ -243,7 +243,7 @@ public class SomeTest { ApprovalInfo approvalInfo = new ApprovalInfo(); approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF"); - approvalInfo.setSpNo("202306080014"); + approvalInfo.setSpNo("202306080008"); // 模拟第一个节点(部门负责人) @@ -301,8 +301,8 @@ public class SomeTest { spRecord_list.add(asr1); - spRecord_list.add(asr2); - spRecord_list.add(asr3); +// spRecord_list.add(asr2); +// spRecord_list.add(asr3); spRecord_list.add(asr4); approvalInfo.setSpRecord(spRecord_list);