From 48fd2f7909995b823269c604ddbbea57c037f5c7 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 02 八月 2023 18:26:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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