|
|
@@ -106,14 +106,18 @@ public class XmServiceImpl extends BaseServiceImpl<XmMapper, XmEntity> implement
|
|
|
|
|
|
private void judgeXmmcAndXmbhUnique(XmDTO xm) {
|
|
|
//检查项目名称是否重复(xm);
|
|
|
- Long xmIdByXmmc = baseMapper.getXmIdByXmmcOrXmbh(null, xm.getXmmc(), null);
|
|
|
- if (xmIdByXmmc != null && !xmIdByXmmc.equals(xm.getId())) {
|
|
|
- throw new ServiceException("研发项目名称已存在");
|
|
|
+ if(Func.isNotBlank(xm.getXmmc())){
|
|
|
+ Long xmIdByXmmc = baseMapper.getXmIdByXmmcOrXmbh(null, xm.getXmmc(), null);
|
|
|
+ if (xmIdByXmmc != null && !xmIdByXmmc.equals(xm.getId())) {
|
|
|
+ throw new ServiceException("研发项目名称已存在");
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- Long xmIdByXmbh = baseMapper.getXmIdByXmmcOrXmbh(null, null, xm.getXmbh());
|
|
|
- if (xmIdByXmbh != null && !xmIdByXmbh.equals(xm.getId())) {
|
|
|
- throw new ServiceException("研发项目编号已存在");
|
|
|
+ if(Func.isNotBlank(xm.getXmbh())){
|
|
|
+ Long xmIdByXmbh = baseMapper.getXmIdByXmmcOrXmbh(null, null, xm.getXmbh());
|
|
|
+ if (xmIdByXmbh != null && !xmIdByXmbh.equals(xm.getId())) {
|
|
|
+ throw new ServiceException("研发项目编号已存在");
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -123,10 +127,14 @@ public class XmServiceImpl extends BaseServiceImpl<XmMapper, XmEntity> implement
|
|
|
this.judgeXmmcAvailable(xm.getXmmc());
|
|
|
//判断项目名称和编号是否已存在
|
|
|
judgeXmmcAndXmbhUnique(xm);
|
|
|
- if (!Func.equals(xm.getStatus(), XmStatusEnum.暂存.getCode())) {
|
|
|
+ if (Func.equals(xm.getStatus(), XmStatusEnum.暂存.getCode())) {
|
|
|
+ if(Func.isBlank(xm.getXmbh())){
|
|
|
+ throw new ServiceException("请填写项目编号");
|
|
|
+ }
|
|
|
+ }else {
|
|
|
List<String> validate = ValidationUtils.validate(xm);
|
|
|
if (Func.isNotEmpty(validate)) {
|
|
|
- throw new ServiceException(String.join(",", validate));
|
|
|
+ throw new ServiceException(String.join("\n", validate));
|
|
|
}
|
|
|
judgeXmIsOver(xm.getId(), true);
|
|
|
if (xm.getXmyszemx() != null) {
|