From 1d29540c77a0b736e10a9be0c0834c1813c3303e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 20 十二月 2023 14:51:04 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
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..f435d76 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;
}
@@ -129,14 +131,18 @@
if (CommonUtils.isActureChangeData(configItem,configItem2)) {
configItemService.update(configItem);
}
+ if(CommonUtils.isActureChangeData(configItemDto.getConfigItemWarehouse().getLibraryType(),configItem.getLibraryType())){
+ configItem.setLibraryType(configItemDto.getConfigItemWarehouse().getLibraryType());
+ configItemService.update(configItem);
+ }
} else {
Map<String, String> map = new HashMap<>();
String pageCode = configItem.getPageCode();
if (StringUtils.isNotBlank(pageCode) && "plan,explain,record,report".contains(pageCode)) {
map.put("funCode", "test_" + pageCode);
- //map.put("projectId",configItemDto.getProjectId().toString());
configItem.setItemIdentify(sysCodeRuleService.getNewCode(map));
}
+ configItem.setLibraryType(configItemDto.getConfigItemWarehouse().getLibraryType());
configItem.setWarehouseId(warehouseId);
configItem.setProjectId(configItemDto.getConfigItemWarehouse().getProjectId());
configItemService.insert(configItem);
--
Gitblit v1.9.1