From 44a0ef1620cad87479390900eb6ded041c7b8d7b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 17 五月 2024 16:56:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1 --- server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java index 3e7672d..874e23a 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java @@ -404,6 +404,7 @@ } if(dispatchUnitMapper.selectCount(new QueryWrapper<DispatchUnit>().lambda() .ne(DispatchUnit::getId,saveDispatchUnitDTO.getId()) + .ne(DispatchUnit::getBaseId,saveDispatchUnitDTO.getId()) .eq(DispatchUnit::getCompanyId,loginUserInfo.getCompanyId()) .eq(DispatchUnit::getName,saveDispatchUnitDTO.getName()) .eq(DispatchUnit::getIsdeleted,Constants.ZERO) @@ -418,6 +419,11 @@ dispatchUnit.setEditor(loginUserInfo.getId()); dispatchUnitMapper.updateById(dispatchUnit); + dispatchUnitMapper.update(null,new UpdateWrapper<DispatchUnit>().lambda().set(DispatchUnit::getDataType,Constants.ONE).eq(DispatchUnit::getBaseId,dispatchUnit.getId()) + .eq(DispatchUnit::getDataType,Constants.TWO) + ); + + //瀛樺偍鎿嶄綔璁板綍 this.saveDuLog(dispatchUnit,Constants.DispatchUnitLogType.EDIT_UNIT,null); -- Gitblit v1.9.3