From 25d1cb5f63e95da7702ba2c02231cdb8583f11af Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 07 二月 2025 17:43:56 +0800 Subject: [PATCH] 项目审核 --- business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java index ad712b5..2eb6d63 100644 --- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java +++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java @@ -49,6 +49,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; +import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; @@ -237,15 +238,17 @@ Long userId = SecurityUtils.getUserId(); String ancestors = sysDeptMapper.selectAncestors(userId); String[] ancestorArr = ancestors.split(","); -// for (String ancestor : ancestorArr) { -// if ("101".equals(ancestor)) { // 涓氫富 -// query.setCreateBy(userId); -// query.setRole(0); -// } else if ("102".equals(ancestor)) { // 瀹℃壒 -// query.setUsedStatus(1); -// query.setRole(1); -// } -// } + List<String> ancestorList = Arrays.stream(ancestorArr).collect(Collectors.toList()); + ancestorList.add(SecurityUtils.getDeptId()+""); + if(!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("101")){ + query.setProjectOwnerUnit(SecurityUtils.getDeptId()); + //涓氫富 + query.setRole(0); + }else if(!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("102")){ + query.setCompetentDepartment(SecurityUtils.getDeptId()); + //瀹℃壒 瀵瑰簲涓荤閮ㄩ棬 + query.setRole(1); + } IPage<ProjectInfoVO> page = PageUtil.getPage(query, ProjectInfoVO.class); baseMapper.getPage(query, page); @@ -393,8 +396,6 @@ .map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP)) .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "鐪�")); indexCountVO.setImpTypeCountVO(impTypeCountVO); - - return indexCountVO; } -- Gitblit v1.8.0