From ddf81d93ff5abc2825357fe2810f031e52beeebc Mon Sep 17 00:00:00 2001 From: wang1 <844966816@qq.com> Date: 星期五, 11 八月 2023 16:15:24 +0800 Subject: [PATCH] mdm流程处理页面,修复按钮显示异常问题 --- Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java | 12 +++--------- 1 files changed, 3 insertions(+), 9 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 e7a35ac..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,22 +18,15 @@ 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.FlowTaskUser; -import com.vci.ubcs.flow.engine.entity.FlowTaskUserC; -import com.vci.ubcs.flow.engine.entity.ProcessTemplate; -import com.vci.ubcs.flow.engine.mapper.FlowTaskUserMapper; import com.vci.ubcs.flow.engine.mapper.ProcessTemplateMapper; -import com.vci.ubcs.flow.engine.service.FlowEngineService; -import com.vci.ubcs.flow.engine.service.FlowTaskUserService; import com.vci.ubcs.flow.engine.service.ProcessTemplateService; import com.vci.ubcs.starter.web.enumpck.ProcessTemplateTypeEnum; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springblade.core.launch.constant.FlowConstant; import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.mp.support.Condition; import org.springframework.stereotype.Service; import java.util.*; @@ -58,11 +51,12 @@ //鏍¢獙杩欎釜妯℃澘涓嬶紝涓�绫绘寜閽彧鑳芥湁涓�涓ā鏉� QueryWrapper<ProcessTemplate> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("button_type_key", processTemplate.getButtonTypeKey()); + queryWrapper.eq("template_id", processTemplate.getTemplateId()); if(StringUtils.isNotEmpty(processTemplate.getId())) {//淇敼鐨勬椂鍊�,id涓虹┖灏辨槸鏂板 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