From 433cc383e19bcbe826567b09b9ef9247fa46c228 Mon Sep 17 00:00:00 2001 From: 叶松 <2217086471@qq.com> Date: 星期四, 30 十一月 2023 09:56:20 +0800 Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe --- hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/engineering/service/impl/SysSegmentServiceImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/engineering/service/impl/SysSegmentServiceImpl.java b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/engineering/service/impl/SysSegmentServiceImpl.java index 288d8ef..9b09d5b 100644 --- a/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/engineering/service/impl/SysSegmentServiceImpl.java +++ b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/engineering/service/impl/SysSegmentServiceImpl.java @@ -12,6 +12,7 @@ import com.thhy.general.common.BasicResult; import com.thhy.general.config.SysUserInfo; import com.thhy.general.utils.UserInfoUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -98,7 +99,7 @@ String unitProjectName = values.get("unitProjectName").toString(); String segmentId = segmentMapper.segmentNameByProjectName(unitProjectName); - if(!segmentId1.equals(segmentId)){ + if(StringUtils.isNotBlank(segmentId) && !segmentId1.equals(segmentId)){ return BasicResult.faild("11111","error","标段名称被占用"); } segmentMapper.segmentUpdate(values); -- Gitblit v1.9.3