From e53e0d9cc7472153946147d548f572fd14be13f3 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 04 八月 2023 15:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java
index ec83e35..c82ff71 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java
@@ -18,8 +18,8 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.flow.core.entity.ProcessTemplate;
 import com.vci.ubcs.flow.core.utils.TaskUtil;
-import com.vci.ubcs.flow.engine.entity.ProcessTemplate;
 import com.vci.ubcs.flow.engine.mapper.ProcessTemplateMapper;
 import com.vci.ubcs.flow.engine.service.ProcessTemplateService;
 import com.vci.ubcs.starter.web.enumpck.ProcessTemplateTypeEnum;
@@ -56,7 +56,7 @@
 			queryWrapper.ne("id", processTemplate.getId());
 		}
 		if(baseMapper.selectOne(queryWrapper)!=null){
-			throw new ServiceException(processTemplate.getButtonTypeValue()+"鍔熻兘宸茬粡閰嶇疆浜嗘祦绋�!");
+			throw new ServiceException("妯℃澘key锛�"+processTemplate.getModelKey()+"涓庢ā鏉垮悕绉帮細"+processTemplate.getModelName()+",鍦ㄦ妯℃澘涓嬪凡琚厤缃紝璇锋鏌�!");
 		}
 		if(StringUtils.isEmpty(processTemplate.getButtonTypeValue())){
 			processTemplate.setButtonTypeValue(ProcessTemplateTypeEnum.getTextByValue(processTemplate.getButtonTypeKey()));

--
Gitblit v1.9.3