From b672cafe6a447c9b19691b583df9542ad84bce2c Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 26 Nov 2024 16:02:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
index 743259c..4e27a9d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -61,7 +61,7 @@
setAdCode(searchDTO);
BladeUser user = AuthUtil.getUser();
Long roleId = getRoleId();
- setUnit2(searchDTO,user,roleId);
+ //setUnit2(searchDTO,user,roleId);
Boolean isPage = searchDTO.getIsPage();
if (isPage==null) isPage = true;
if (isPage ){
@@ -680,7 +680,7 @@
searchDTO.setSgCodeS(sgCodeS);
BladeUser user = AuthUtil.getUser();
Long roleId = getRoleId();
- setUnit2(searchDTO,user,roleId);
+ //setUnit2(searchDTO,user,roleId);
Map<String, Object> map = new HashMap<>();
List<SgProjectInfoVO> progressList = progressList(searchDTO);
BigDecimal reduce = progressList.stream().filter(s->s.getProjectProgressNum()!=null).map(SgProjectInfoDO::getProjectProgressNum).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -743,7 +743,7 @@
setAdCode(dto);
BladeUser user = AuthUtil.getUser();
Long roleId = getRoleId();
- setUnit2(dto,user,roleId);
+ //setUnit2(dto,user,roleId);
List<SgProjectTreeVO> list = sgProjectInfoMapper.projectTree(dto);
if (CollectionUtils.isNotEmpty(list)){
list.forEach(x->{
--
Gitblit v1.9.3