From 7323a4b0d5f7567c1156a5aa507ad4c898ed410f Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期日, 04 二月 2024 12:23:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java index 79a0fea..5f5cf28 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java @@ -438,16 +438,22 @@ for (CodeAllCode codeAllCode : takeBack) { codeAllCode.setTs(new Date()); codeAllCode.setLastModifyTime(new Date()); - codeAllCode.setLastModifier(AuthUtil.getUserId().toString()); - Iterator<CodeAllCode> iterator = allCodeDOList.iterator(); - while (iterator.hasNext()){ + codeAllCode.setLastModifier(Func.isNotEmpty(user) ? user.getAccount():AuthUtil.getUserAccount()); + for (int i = 0; i < allCodeDOList.size(); i++) { + if(codeAllCode.getId().equals(allCodeDOList.get(i).getId())){ + codeAllCode.setCreateCodeOid(allCodeDOList.get(i).getCreateCodeOid()); + codeAllCode.setLcStatus(allCodeDOList.get(i).getLcStatus()); + allCodeDOList.remove(i); + } + } + /*while (iterator.hasNext()){ CodeAllCode next = iterator.next(); if(codeAllCode.getId().equals(next.getId())){ codeAllCode.setCreateCodeOid(next.getCreateCodeOid()); codeAllCode.setLcStatus(next.getLcStatus()); //iterator.remove(); } - } + }*/ } if(takeBack.size()>0){ codeAllCodeService.updateBatchById(takeBack); @@ -614,7 +620,7 @@ } } } - + /** * 杞崲娴佹按鐮佹鐨勫�� * @param serialSecVOList 娴佹按鐮佹 @@ -1259,14 +1265,21 @@ codeAllCode.setLastModifyTime(new Date()); codeAllCode.setLastModifier(AuthUtil.getUserId().toString()); Iterator<CodeAllCode> iterator = allCodeDOList.iterator(); - while (iterator.hasNext()){ + for (int i = 0; i < allCodeDOList.size(); i++) { + if(codeAllCode.getId().equals(allCodeDOList.get(i).getId())){ + codeAllCode.setCreateCodeOid(allCodeDOList.get(i).getCreateCodeOid()); + codeAllCode.setLcStatus(allCodeDOList.get(i).getLcStatus()); + allCodeDOList.remove(i); + } + } + /*while (iterator.hasNext()){ CodeAllCode next = iterator.next(); if(codeAllCode.getId().equals(next.getId())){ codeAllCode.setCreateCodeOid(next.getCreateCodeOid()); codeAllCode.setLcStatus(next.getLcStatus()); //iterator.remove(); } - } + }*/ } if(takeBack.size()>0){ codeAllCodeService.updateBatchById(takeBack); -- Gitblit v1.9.3