Browse Source

[task-3653]设备验收记录表:验收人审核通过但是流程显示会签不通过

szjbdgzl 1 year ago
parent
commit
baa11c7476

+ 4 - 4
ibps-bpmn-root/modules/bpmn-biz/src/main/java/com/lc/ibps/bpmn/service/impl/BpmApprovalServiceImpl.java

@@ -171,7 +171,7 @@ public abstract class BpmApprovalServiceImpl implements BpmApprovalService {
 			bpmApproveHisRepository.removeForUpdate();
 		}
 		
-		list = mergeSignApproval(list);
+		// list = mergeSignApproval(list);
 		
 		list = signCallSubApproval(list);
 		
@@ -322,16 +322,16 @@ public abstract class BpmApprovalServiceImpl implements BpmApprovalService {
 						approvalSignPo = addFirstSign(rs, batch, approvalPo);
 					}
 				}
-				
+
 				if(taskSignPo.getBatch().equals(batch)) {
 					mergeSameSignQualfieds(approvalSignPo, approvalPo);
 				} else {
 					batch = taskSignPo.getBatch();
-					
+
 					if(!batchSet.contains(batch)) {
 						approvalSignPo = addFirstSign(rs, batch, approvalPo);
 					}
-					
+
 					mergeSameSignQualfieds(approvalSignPo, approvalPo);
 				}