diff --git a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java index 41cf263e..c0e34881 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java @@ -328,14 +328,18 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr adrSbmtLineMgrUsrVO.setWhereQuery(" AND agnt_sbmt_id='ID2' "); adrSbmtMgrHstryService.deleteWithQuery(adrSbmtLineMgrUsrVO); - //step4.이력 정보 남기기 처리를 해야 한다. I - adr_sbmt_mgr_hstry - this._insertAdrSbmtMgrHstry( - adrSbmtLineMgrUsrVO - , aprvlMgrVO - , "ID2" - , adrSbmtLineMgrUsrVO.getSbsttSbmtId2() - , adrSbmtLineMgrUsrVO.getSbmtId2() - ); + if (!"".equals(adrSbmtLineMgrUsrVO.getSbsttSbmtId2())) { + //대결자가 있는 경우만 이력을 남긴다. + //step4.이력 정보 남기기 처리를 해야 한다. I - adr_sbmt_mgr_hstry + this._insertAdrSbmtMgrHstry( + adrSbmtLineMgrUsrVO + , aprvlMgrVO + , "ID2" + , adrSbmtLineMgrUsrVO.getSbsttSbmtId2() + , adrSbmtLineMgrUsrVO.getSbmtId2() + ); + } + } if ("A".equals(adrSbmtLineMgrUsrVO.getSbmtYn3())) { //1단계 결재 전임 @@ -349,14 +353,18 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr adrSbmtLineMgrUsrVO.setWhereQuery(" AND agnt_sbmt_id='ID3' "); adrSbmtMgrHstryService.deleteWithQuery(adrSbmtLineMgrUsrVO); - //step4.이력 정보 남기기 처리를 해야 한다. I - adr_sbmt_mgr_hstry - this._insertAdrSbmtMgrHstry( - adrSbmtLineMgrUsrVO - , aprvlMgrVO - , "ID3" - , adrSbmtLineMgrUsrVO.getSbsttSbmtId3() - , adrSbmtLineMgrUsrVO.getSbmtId3() - ); + if (!"".equals(adrSbmtLineMgrUsrVO.getSbsttSbmtId3())) { + //대결자가 있는 경우만 이력을 남긴다. + //step4.이력 정보 남기기 처리를 해야 한다. I - adr_sbmt_mgr_hstry + this._insertAdrSbmtMgrHstry( + adrSbmtLineMgrUsrVO + , aprvlMgrVO + , "ID3" + , adrSbmtLineMgrUsrVO.getSbsttSbmtId3() + , adrSbmtLineMgrUsrVO.getSbmtId3() + ); + } + } //step2.기존 이력 데이터를 모두 삭제하고 D - adr_sbmt_mgr_hstry