From f363af30e72b3e68963ffa4ba0440abdac3b23e1 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 22:20:02 +0800
Subject: [PATCH] 加上县级单位过滤
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 6 ++++++
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java | 3 +++
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java | 5 +++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml | 3 +++
4 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java
index cd562b1..0b7b3be 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java
@@ -163,6 +163,9 @@
private String selfUnit;
@TableField(exist = false)
+ private String countyUnit;
+
+ @TableField(exist = false)
private String countyCd;
@TableField(exist = false)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
index 32d0c72..4ccf2d5 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
@@ -56,6 +56,11 @@
private Long userUnit;
/**
+ * 县单位位
+ */
+ private Long countryUnit;
+
+ /**
* 用户角色
*/
private Long roleUnit;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
index 68eec29..ae84df6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -99,6 +99,9 @@
<if test="dto.userUnit != null and dto.userUnit != ''">
and si.CONTROL_UNIT=#{dto.userUnit}
</if>
+ <if test="dto.countyUnit != null and dto.countyUnit != ''">
+ and dria."county_cd"=#{dto.userUnit}
+ </if>
<if test="dto.roleUnit != null and dto.roleUnit != ''">
and userR.role_id=#{dto.roleUnit}
</if>
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 00a8fd4..5379e04 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
@@ -526,6 +526,8 @@
if(!user.getRoleId().equals("1811657352658042882")){
searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+ }else{
+ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
}
searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
//searchDTO.setUserId(userId);
@@ -571,6 +573,8 @@
if(!user.getRoleId().equals("1811657352658042882")){
searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+ }else{
+ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
}
searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
@@ -652,6 +656,8 @@
//判断是不是县级建办 否的话就是监理单位下人员进行
if(!user.getRoleId().equals("1811657352658042882")){
searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+ }else{
+ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
}
searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
// if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
--
Gitblit v1.9.3