From 1852bb81508f3a08be8ed56065b3f93df22269d8 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 15:23:35 +0800
Subject: [PATCH] 我的审核加上县级建办过滤

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
index d236472..780f175 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -509,8 +509,11 @@
 	@Override
 	public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
 		BladeUser user = AuthUtil.getUser();
-		//Long userId = user.getUserId();
-		searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+		if(!user.getRoleId().equals("1811657352658042882")){
+
+			searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+		}
+
 		searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
 		//searchDTO.setUserId(userId);
 		//searchDTO.setAuditPerson(userId.toString());
@@ -587,8 +590,10 @@
 	@Override
 	public IPage<SgProgressReportVO> progressPage(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
 		BladeUser user = AuthUtil.getUser();
-		//Long userId = user.getUserId();
-		searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+		//判断是不是县级建办  否的话就是监理单位下人员进行
+		if(!user.getRoleId().equals("1811657352658042882")){
+			searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+		}
 		searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
 //		if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
 //			searchDTO.setAuditPerson(String.valueOf(userId));

--
Gitblit v1.9.3