From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 24 七月 2023 17:29:24 +0800
Subject: [PATCH] 1、修改查询按钮时的条件，使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。
---
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowTaskUserController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowTaskUserController.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowTaskUserController.java
index 8aaba6c..0b8613b 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowTaskUserController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowTaskUserController.java
@@ -1,7 +1,6 @@
package com.vci.ubcs.flow.engine.controller;
-import com.vci.ubcs.flow.engine.entity.FlowTaskUserC;
-import com.vci.ubcs.flow.engine.service.FlowEngineService;
+import com.vci.ubcs.flow.core.dto.FlowTaskDTO;
import com.vci.ubcs.flow.engine.service.FlowTaskUserService;
import lombok.AllArgsConstructor;
import org.springblade.core.tenant.annotation.NonDS;
@@ -24,11 +23,12 @@
/**
* 娴佺▼task瀹℃壒浜哄憳鍒楄〃
+ * ProcessTemplateTypeEnum
* @return
*/
@GetMapping("list")
- public R<FlowTaskUserC> list() {
- return R.data(taskUserService.getUser());
+ public R<Object> list(String type,String templateId) {
+ return R.data(taskUserService.getUser(type,templateId));
}
/**
@@ -37,7 +37,7 @@
* @return
*/
@PostMapping("su")
- public R<String> saveUser(@RequestBody FlowTaskUserC flowTaskUserC) {
+ public R<String> saveUser(@RequestBody FlowTaskDTO flowTaskUserC) {
taskUserService.saveOrUpdateUser(flowTaskUserC);
return R.success("淇濆瓨鎴愬姛");
}
@@ -48,7 +48,7 @@
* @return
*/
@PostMapping("du")
- public R<String> deleteUser(@RequestBody FlowTaskUserC flowTaskUserC) {
+ public R<String> deleteUser(@RequestBody FlowTaskDTO flowTaskUserC) {
taskUserService.deleteUser(flowTaskUserC.getName());
return R.success("鍒犻櫎鎴愬姛");
}
--
Gitblit v1.9.3