From 810d10eb373bb181ca0e155d8bed8433fd69ebc0 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 12 十二月 2023 15:50:17 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java | 16 +++++++++-------
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 4 +++-
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java | 4 +++-
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java | 4 +++-
4 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java
index b386f46..9ac6d51 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java
@@ -89,8 +89,10 @@
* @return
*/
public List<ConfigItemChange> page(QueryFilter queryFilter) {
- List<ConfigItemChange> list= baseDao.getList(queryFilter.getQueryParams());
- workflowService.getRunFlow(list,"pzxbg");
+ List<ConfigItemChange> list = baseDao.getList(queryFilter.getQueryParams());
+ if (list.size() > 0) {
+ workflowService.getRunFlow(list, "pzxbg");
+ }
return list;
}
@@ -210,15 +212,15 @@
try {
ConfigItemChangeDto dataObj = this.getDto(null, id);
- String qaAuditorPath = "鏂囦欢鍥剧墖:"+ getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemChange().getQaAuditorId()));
+ String qaAuditorPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemChange().getQaAuditorId()));
dataObj.getConfigItemChange().setQaAuditor(qaAuditorPath);
- String cmAuditorPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemChange().getCmAuditorId()));
+ String cmAuditorPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemChange().getCmAuditorId()));
dataObj.getConfigItemChange().setCmAuditor(cmAuditorPath);
- String implementerPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemChange().getImplementerId()));
+ String implementerPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemChange().getImplementerId()));
dataObj.getConfigItemChange().setImplementer(implementerPath);
- String approvalSignPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemChange().getApprovalId()));
+ String approvalSignPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemChange().getApprovalId()));
dataObj.getConfigItemChange().setApprovalSign(approvalSignPath);
- String warehouseOperatorPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemChange().getWarehouseOperatorId()));
+ String warehouseOperatorPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemChange().getWarehouseOperatorId()));
dataObj.getConfigItemChange().setWarehouseOperator(warehouseOperatorPath);
/*String outboundOperatorPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemChange().getOutboundOperatorId()));
dataObj.getConfigItemChange().setOutboundOperator(outboundOperatorPath);*/
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
index d544997..f07f6d4 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
@@ -95,7 +95,9 @@
*/
public List<ConfigItemWarehouse> page(QueryFilter queryFilter) {
List<ConfigItemWarehouse> list= baseDao.getList(queryFilter.getQueryParams());
- workflowService.getRunFlow(list,"pzxrk");
+ if (list.size() > 0) {
+ workflowService.getRunFlow(list, "pzxrk");
+ }
return list;
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
index 43ad94b..2c1cd9a 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
@@ -80,7 +80,9 @@
*/
public List<ItemCirculatOrder> page(QueryFilter queryFilter) {
List<ItemCirculatOrder> list= baseDao.getList(queryFilter.getQueryParams());
- workflowService.getRunFlow(list,"pzxrk");
+ if (list.size() > 0) {
+ workflowService.getRunFlow(list, "pzxrk");
+ }
return list;
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
index 2f1d9b9..e67a2f2 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
@@ -76,7 +76,9 @@
*/
public List<TestCheckOrder> page(QueryFilter queryFilter) {
List<TestCheckOrder> list = baseDao.getList(queryFilter.getQueryParams());
- workflowService.getRunFlow(list, "csjcd");
+ if (list.size() > 0) {
+ workflowService.getRunFlow(list, "csjcd");
+ }
return list;
}
--
Gitblit v1.9.1