diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index ac83974f9..19cdc6051 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -267,6 +267,7 @@ public class WxFlowAbleController extends BaseController { pageNum = 1; } + wxFlowConfig.setParentId(0l); PageInfo pageInfo = wxFlowService.configList(wxFlowConfig,pageNum,pageSize); List list = pageInfo.getList(); for (WxFlowConfig c:list) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 29f56424a..0a3656223 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -1219,6 +1219,14 @@ public class WxFlowServiceImpl implements WxFlowService { @Override public ResultData delModel(WxFlowModel wxFlowModel) { + WxFlowConfig query = new WxFlowConfig(); + query.setTenantId(wxFlowModel.getTenantId()); + query.setModelId(wxFlowModel.getId()); + if(CollectionUtils.isNotEmpty(wxFlowConfigMapper.findList(query))){ + return new ResultData(Result.ERROR, "该流程模板在使用中,须先停用正在\n" + + "使用该模板的审批类型。"); + } + wxFlowModelMapper.deleteByPrimaryKey(wxFlowModel.getId()); return new ResultData(); } diff --git a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml index 8b1237f7e..4025c48c2 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml @@ -18,12 +18,12 @@ - where parent_id =0 - - and `tenant_id` = #{tenantId} - + where 1=1 + and `parent_id` = #{parentId} + and `tenant_id` = #{tenantId} and `id` = #{id} - and `name` like concat('%', #{name},'%') + and `model_id` = #{modelId} + and `name` like concat('%', #{name},'%') order by ${sortColumns} order by sort asc diff --git a/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml index 7f6da0a88..b1f8dbdc5 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml @@ -19,7 +19,7 @@ and `tenant_id` = #{tenantId} and `id` = #{id} - and `name` like concat('%', #{name},'%') + and `name` like concat('%', #{name},'%') order by ${sortColumns} order by id desc