diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml
index 8cddc1960..58d599ae8 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml
@@ -179,7 +179,7 @@
update_user_id = #{updateUserId},
- remark = #{remark},
+ remark = #{remark}
where deleted = 0
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyOutboundServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyOutboundServiceImpl.java
index 6e758f95d..a56e51d3d 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyOutboundServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyOutboundServiceImpl.java
@@ -95,6 +95,7 @@ public class HyOutboundServiceImpl implements HyOutboundService {
Long id = hyOutboundMobileDO.getId();
hyOutboundMobileDO.setId(null);
List outboundMobileList = outboundMobileMapper.selectByPrimarySelective(hyOutboundMobileDO);
+ hyOutboundMobileDO.setId(id);
//如果修改后的号码与原号码一致也不算重复,但是要记录更新人
if (outboundMobileList != null && outboundMobileList.size() > 0) {
//更新操作还要检查是否与原号码信息相同,相同的话也不算重复
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelGroupServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelGroupServiceImpl.java
index 9a5049628..e220b230d 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelGroupServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelGroupServiceImpl.java
@@ -71,6 +71,7 @@ public class LabelGroupServiceImpl implements LabelGroupService {
public void updateLabelGroup(LabelGroupUpdateDTO dto) throws ApiException {
HyPartnerLabelGroupDO labelGroupDO = new HyPartnerLabelGroupDO();
labelGroupDO.setLabelGroupName(dto.getLabelGroupName());
+ labelGroupDO.setId(dto.getId());
if (whetherGroupDuplicated(labelGroupDO)) {
throw new ApiException(ErrorCodeEnum.LABEL_GROUP_EXIST);
}
@@ -121,6 +122,7 @@ public class LabelGroupServiceImpl implements LabelGroupService {
Long id = labelGroupDO.getId();
labelGroupDO.setId(null);
List hyPartnerLabelGroupDOS = labelGroupMapper.selectSelective(labelGroupDO);
+ labelGroupDO.setId(id);
//如果修改后的标签组名与原标签组名一致也不算重复,但是要记录更新人
if (hyPartnerLabelGroupDOS != null && hyPartnerLabelGroupDOS.size() > 0) {
//更新操作还要检查是否与原标签组信息相同,相同的话也不算重复
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelServiceImpl.java
index 548ef2f25..09075ca25 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelServiceImpl.java
@@ -102,6 +102,7 @@ public class LabelServiceImpl implements LabelService {
Long id = label.getId();
label.setId(null);
List hyPartnerLabelDOS = labelMapper.selectSelective(label);
+ label.setId(id);
//如果修改后的标签名与原标签名一致也不算重复,但是要记录更新人
if (hyPartnerLabelDOS != null && hyPartnerLabelDOS.size() > 0) {
//更新操作还要检查是否与原标签信息相同,相同的话也不算重复