From b80a8aebe381f543bbe1583af85f8d4eea999bcf Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 02 八月 2023 17:08:52 +0800
Subject: [PATCH] 1、解决模板升版流程没有复制流程模板问题。 2、增加流程的条件查询与流程的批量保存feign接口

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
index 83408a0..3aa955a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -306,8 +306,8 @@
 		pageHelper.addDefaultAsc("ordernum");
 		Query query = new Query();
 		query.setAscs("ordernum");
+		query.setSize(pageHelper.getLimit());
 		if(pageHelper.getLimit() != -1){
-			query.setSize(pageHelper.getLimit());
 			query.setCurrent(pageHelper.getPage());
 		}
 		IPage<CodeClassifyTemplateAttr> doList = baseMapper.
@@ -456,10 +456,6 @@
 		if(!CollectionUtils.isEmpty(oids)){
 			this.removeBatchByIds(oids);
 		}
-		String tenantId = AuthUtil.getTenantId().toString();
-		codeClassifyTemplateAttrDOInsert.parallelStream().forEach(item->{
-			item.setTenantId(tenantId);
-		});
 		//鍐嶆柊澧�
 		if(!CollectionUtils.isEmpty(codeClassifyTemplateAttrDOInsert)){
 			this.saveBatch(codeClassifyTemplateAttrDOInsert);

--
Gitblit v1.9.3