From b37989329fc2df7b348380a2aac28cae45dd59de Mon Sep 17 00:00:00 2001
From: hansha <bdqn_hansha@163.com>
Date: Sat, 20 Apr 2024 10:57:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=84=E4=B8=AA=E6=A8=A1=E5=9D=97=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SzxcBankcardInfoController.java           |  5 ++++
 .../controller/SzxcCarInfoController.java     | 27 +++++++++----------
 .../SzxcDiscussCentreController.java          | 27 +++++++++----------
 .../controller/SzxcDyManageController.java    | 27 +++++++++----------
 .../controller/SzxcHjAddressController.java   |  5 ++++
 .../controller/SzxcHouseInfoController.java   |  5 ++++
 .../szxc/controller/SzxcLdInfoController.java | 27 +++++++++----------
 .../controller/SzxcPlaceManageController.java | 27 +++++++++----------
 .../SzxcPublicActivilyController.java         | 27 +++++++++----------
 .../szxc/controller/SzxcSbzlController.java   | 27 +++++++++----------
 .../szxc/controller/SzxcXqInfoController.java | 27 +++++++++----------
 .../szxc/controller/SzxcZcssController.java   | 26 +++++++++---------
 .../szxc/controller/SzxcZcssxjController.java |  5 ++++
 .../impl/SzxcBankcardInfoServiceImpl.java     |  2 ++
 .../service/impl/SzxcCarInfoServiceImpl.java  | 11 +++++---
 .../impl/SzxcDiscussCentreServiceImpl.java    | 11 +++++---
 .../service/impl/SzxcDyManageServiceImpl.java |  2 ++
 .../impl/SzxcHjAddressServiceImpl.java        |  2 ++
 .../impl/SzxcHouseInfoServiceImpl.java        |  2 ++
 .../service/impl/SzxcLdInfoServiceImpl.java   | 11 +++++---
 .../impl/SzxcPlaceManageServiceImpl.java      | 11 +++++---
 .../impl/SzxcPublicActivilyServiceImpl.java   | 11 +++++---
 .../service/impl/SzxcSbzlServiceImpl.java     | 11 +++++---
 .../service/impl/SzxcXqInfoServiceImpl.java   | 11 +++++---
 .../service/impl/SzxcZcssServiceImpl.java     |  2 ++
 .../service/impl/SzxcZcssxjServiceImpl.java   | 11 +++++---
 .../mapper/szxc/SzxcBankcardInfoMapper.xml    |  7 +++--
 .../mapper/szxc/SzxcCarInfoMapper.xml         |  5 +++-
 .../mapper/szxc/SzxcDiscussCentreMapper.xml   |  5 +++-
 .../mapper/szxc/SzxcDyManageMapper.xml        |  5 +++-
 .../mapper/szxc/SzxcHjAddressMapper.xml       |  7 +++--
 .../mapper/szxc/SzxcHouseInfoMapper.xml       |  7 +++--
 .../mapper/szxc/SzxcLdInfoMapper.xml          |  5 +++-
 .../mapper/szxc/SzxcPlaceManageMapper.xml     |  7 +++--
 .../mapper/szxc/SzxcPublicActivilyMapper.xml  |  8 ++++--
 .../resources/mapper/szxc/SzxcSbzlMapper.xml  |  7 +++--
 .../mapper/szxc/SzxcXqInfoMapper.xml          |  7 +++--
 .../resources/mapper/szxc/SzxcZcssMapper.xml  |  5 +++-
 .../mapper/szxc/SzxcZcssxjMapper.xml          |  5 +++-
 39 files changed, 262 insertions(+), 178 deletions(-)

diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcBankcardInfoController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcBankcardInfoController.java
index 37cca5c..943cac1 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcBankcardInfoController.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcBankcardInfoController.java
@@ -71,6 +71,11 @@ public class SzxcBankcardInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcBankcardInfo szxcBankcardInfo)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcBankcardInfo.getDeptId()==null){
+            szxcBankcardInfo.setDeptId(getDeptId());
+        }
+        szxcBankcardInfo.setUserId(getUserId());
         return toAjax(szxcBankcardInfoService.insertSzxcBankcardInfo(szxcBankcardInfo));
     }
 
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcCarInfoController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcCarInfoController.java
index 8fe7fb7..572fcb7 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcCarInfoController.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcCarInfoController.java
@@ -1,25 +1,19 @@
 package com.ruoyi.szxc.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.szxc.domain.SzxcCarInfo;
 import com.ruoyi.szxc.service.ISzxcCarInfoService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 车辆信息Controller
@@ -77,6 +71,11 @@ public class SzxcCarInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcCarInfo szxcCarInfo)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcCarInfo.getDeptId()==null){
+            szxcCarInfo.setDeptId(getDeptId());
+        }
+        szxcCarInfo.setUserId(getUserId());
         return toAjax(szxcCarInfoService.insertSzxcCarInfo(szxcCarInfo));
     }
 
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcDiscussCentreController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcDiscussCentreController.java
index 73db5b4..c479847 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcDiscussCentreController.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcDiscussCentreController.java
@@ -1,25 +1,19 @@
 package com.ruoyi.szxc.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.szxc.domain.SzxcDiscussCentre;
 import com.ruoyi.szxc.service.ISzxcDiscussCentreService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 议事中心Controller
@@ -77,6 +71,11 @@ public class SzxcDiscussCentreController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcDiscussCentre szxcDiscussCentre)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcDiscussCentre.getDeptId()==null){
+            szxcDiscussCentre.setDeptId(getDeptId());
+        }
+        szxcDiscussCentre.setUserId(getUserId());
         return toAjax(szxcDiscussCentreService.insertSzxcDiscussCentre(szxcDiscussCentre));
     }
 
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcDyManageController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcDyManageController.java
index 0c85f7c..c81987a 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcDyManageController.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcDyManageController.java
@@ -1,25 +1,19 @@
 package com.ruoyi.szxc.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.szxc.domain.SzxcDyManage;
 import com.ruoyi.szxc.service.ISzxcDyManageService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 党员管理Controller
@@ -77,6 +71,11 @@ public class SzxcDyManageController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcDyManage szxcDyManage)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcDyManage.getDeptId()==null){
+            szxcDyManage.setDeptId(getDeptId());
+        }
+        szxcDyManage.setUserId(getUserId());
         return toAjax(szxcDyManageService.insertSzxcDyManage(szxcDyManage));
     }
 
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHjAddressController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHjAddressController.java
index e5624ad..4bdcfcc 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHjAddressController.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHjAddressController.java
@@ -71,6 +71,11 @@ public class SzxcHjAddressController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcHjAddress szxcHjAddress)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcHjAddress.getDeptId()==null){
+            szxcHjAddress.setDeptId(getDeptId());
+        }
+        szxcHjAddress.setUserId(getUserId());
         return szxcHjAddressService.insertSzxcHjAddress(szxcHjAddress);
     }
 
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHouseInfoController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHouseInfoController.java
index 54c864e..9d4dd68 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHouseInfoController.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHouseInfoController.java
@@ -71,6 +71,11 @@ public class SzxcHouseInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcHouseInfo szxcHouseInfo)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcHouseInfo.getDeptId()==null){
+            szxcHouseInfo.setDeptId(getDeptId());
+        }
+        szxcHouseInfo.setUserId(getUserId());
         return toAjax(szxcHouseInfoService.insertSzxcHouseInfo(szxcHouseInfo));
     }
 
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcLdInfoController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcLdInfoController.java
index 2920927..213f76a 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcLdInfoController.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcLdInfoController.java
@@ -1,25 +1,19 @@
 package com.ruoyi.szxc.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.szxc.domain.SzxcLdInfo;
 import com.ruoyi.szxc.service.ISzxcLdInfoService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 楼栋信息Controller
@@ -77,6 +71,11 @@ public class SzxcLdInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcLdInfo szxcLdInfo)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcLdInfo.getDeptId()==null){
+            szxcLdInfo.setDeptId(getDeptId());
+        }
+        szxcLdInfo.setUserId(getUserId());
         return toAjax(szxcLdInfoService.insertSzxcLdInfo(szxcLdInfo));
     }
 
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcPlaceManageController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcPlaceManageController.java
index 4b69ebf..cc5c969 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcPlaceManageController.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcPlaceManageController.java
@@ -1,25 +1,19 @@
 package com.ruoyi.szxc.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.szxc.domain.SzxcPlaceManage;
 import com.ruoyi.szxc.service.ISzxcPlaceManageService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 场所管理Controller
@@ -77,6 +71,11 @@ public class SzxcPlaceManageController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcPlaceManage szxcPlaceManage)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcPlaceManage.getDeptId()==null){
+            szxcPlaceManage.setDeptId(getDeptId());
+        }
+        szxcPlaceManage.setUserId(getUserId());
         return toAjax(szxcPlaceManageService.insertSzxcPlaceManage(szxcPlaceManage));
     }
 
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcPublicActivilyController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcPublicActivilyController.java
index 846effe..2374f66 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcPublicActivilyController.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcPublicActivilyController.java
@@ -1,25 +1,19 @@
 package com.ruoyi.szxc.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.szxc.domain.SzxcPublicActivily;
 import com.ruoyi.szxc.service.ISzxcPublicActivilyService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 公益活动Controller
@@ -77,6 +71,11 @@ public class SzxcPublicActivilyController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcPublicActivily szxcPublicActivily)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcPublicActivily.getDeptId()==null){
+            szxcPublicActivily.setDeptId(getDeptId());
+        }
+        szxcPublicActivily.setUserId(getUserId());
         return toAjax(szxcPublicActivilyService.insertSzxcPublicActivily(szxcPublicActivily));
     }
 
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcSbzlController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcSbzlController.java
index 44b4bb4..ea932c3 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcSbzlController.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcSbzlController.java
@@ -1,25 +1,19 @@
 package com.ruoyi.szxc.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.szxc.domain.SzxcSbzl;
 import com.ruoyi.szxc.service.ISzxcSbzlService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 上报资料Controller
@@ -88,6 +82,11 @@ public class SzxcSbzlController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody SzxcSbzl szxcSbzl)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcSbzl.getDeptId()==null){
+            szxcSbzl.setDeptId(getDeptId());
+        }
+        szxcSbzl.setUserId(getUserId());
         return toAjax(szxcSbzlService.updateSzxcSbzl(szxcSbzl));
     }
 
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXqInfoController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXqInfoController.java
index 9316bcc..007b1a1 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXqInfoController.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXqInfoController.java
@@ -1,25 +1,19 @@
 package com.ruoyi.szxc.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.szxc.domain.SzxcXqInfo;
 import com.ruoyi.szxc.service.ISzxcXqInfoService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 小区信息Controller
@@ -77,6 +71,11 @@ public class SzxcXqInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcXqInfo szxcXqInfo)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcXqInfo.getDeptId()==null){
+            szxcXqInfo.setDeptId(getDeptId());
+        }
+        szxcXqInfo.setUserId(getUserId());
         return toAjax(szxcXqInfoService.insertSzxcXqInfo(szxcXqInfo));
     }
 
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssController.java
index 4410438..e7ddf05 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssController.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssController.java
@@ -1,25 +1,19 @@
 package com.ruoyi.szxc.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.szxc.domain.SzxcZcss;
 import com.ruoyi.szxc.service.ISzxcZcssService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 资产设施Controller
@@ -77,6 +71,10 @@ public class SzxcZcssController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcZcss szxcZcss)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcZcss.getDeptId()==null){
+            szxcZcss.setDeptId(getDeptId());
+        }
         return toAjax(szxcZcssService.insertSzxcZcss(szxcZcss));
     }
 
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssxjController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssxjController.java
index 2fdb95f..c76b545 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssxjController.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssxjController.java
@@ -71,6 +71,11 @@ public class SzxcZcssxjController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcZcssxj szxcZcssxj)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcZcssxj.getDeptId()==null){
+            szxcZcssxj.setDeptId(getDeptId());
+        }
+        szxcZcssxj.setUserId(getUserId());
         return toAjax(szxcZcssxjService.insertSzxcZcssxj(szxcZcssxj));
     }
 
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcBankcardInfoServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcBankcardInfoServiceImpl.java
index 9b76b0f..41c33b6 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcBankcardInfoServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcBankcardInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.szxc.service.impl;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.szxc.domain.SzxcBankcardInfo;
 import com.ruoyi.szxc.mapper.SzxcBankcardInfoMapper;
@@ -41,6 +42,7 @@ public class SzxcBankcardInfoServiceImpl implements ISzxcBankcardInfoService
      * @return 银行卡信息
      */
     @Override
+    @DataScope(deptAlias = "b")
     public List<SzxcBankcardInfo> selectSzxcBankcardInfoList(SzxcBankcardInfo szxcBankcardInfo)
     {
         return szxcBankcardInfoMapper.selectSzxcBankcardInfoList(szxcBankcardInfo);
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcCarInfoServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcCarInfoServiceImpl.java
index cb1158b..b322191 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcCarInfoServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcCarInfoServiceImpl.java
@@ -1,12 +1,14 @@
 package com.ruoyi.szxc.service.impl;
 
-import java.util.List;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.szxc.mapper.SzxcCarInfoMapper;
 import com.ruoyi.szxc.domain.SzxcCarInfo;
+import com.ruoyi.szxc.mapper.SzxcCarInfoMapper;
 import com.ruoyi.szxc.service.ISzxcCarInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 车辆信息Service业务层处理
@@ -39,6 +41,7 @@ public class SzxcCarInfoServiceImpl implements ISzxcCarInfoService
      * @return 车辆信息
      */
     @Override
+    @DataScope(deptAlias = "c")
     public List<SzxcCarInfo> selectSzxcCarInfoList(SzxcCarInfo szxcCarInfo)
     {
         return szxcCarInfoMapper.selectSzxcCarInfoList(szxcCarInfo);
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcDiscussCentreServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcDiscussCentreServiceImpl.java
index 98240e6..99691b1 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcDiscussCentreServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcDiscussCentreServiceImpl.java
@@ -1,12 +1,14 @@
 package com.ruoyi.szxc.service.impl;
 
-import java.util.List;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.szxc.mapper.SzxcDiscussCentreMapper;
 import com.ruoyi.szxc.domain.SzxcDiscussCentre;
+import com.ruoyi.szxc.mapper.SzxcDiscussCentreMapper;
 import com.ruoyi.szxc.service.ISzxcDiscussCentreService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 议事中心Service业务层处理
@@ -39,6 +41,7 @@ public class SzxcDiscussCentreServiceImpl implements ISzxcDiscussCentreService
      * @return 议事中心
      */
     @Override
+    @DataScope(deptAlias = "d")
     public List<SzxcDiscussCentre> selectSzxcDiscussCentreList(SzxcDiscussCentre szxcDiscussCentre)
     {
         return szxcDiscussCentreMapper.selectSzxcDiscussCentreList(szxcDiscussCentre);
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcDyManageServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcDyManageServiceImpl.java
index a38215a..2ee695a 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcDyManageServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcDyManageServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.szxc.service.impl;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.szxc.domain.SzxcDyManage;
 import com.ruoyi.szxc.mapper.SzxcDyManageMapper;
@@ -40,6 +41,7 @@ public class SzxcDyManageServiceImpl implements ISzxcDyManageService
      * @return 党员管理
      */
     @Override
+    @DataScope(deptAlias = "d")
     public List<SzxcDyManage> selectSzxcDyManageList(SzxcDyManage szxcDyManage)
     {
         return szxcDyManageMapper.selectSzxcDyManageList(szxcDyManage);
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHjAddressServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHjAddressServiceImpl.java
index b48afc3..89d54db 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHjAddressServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHjAddressServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.szxc.service.impl;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.szxc.domain.SzxcHjAddress;
@@ -41,6 +42,7 @@ public class SzxcHjAddressServiceImpl implements ISzxcHjAddressService
      * @return 户主信息
      */
     @Override
+    @DataScope(deptAlias = "a")
     public List<SzxcHjAddress> selectSzxcHjAddressList(SzxcHjAddress szxcHjAddress)
     {
         return szxcHjAddressMapper.selectSzxcHjAddressList(szxcHjAddress);
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHouseInfoServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHouseInfoServiceImpl.java
index f848a06..e95609d 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHouseInfoServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHouseInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.szxc.service.impl;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.szxc.domain.SzxcHouseInfo;
 import com.ruoyi.szxc.mapper.SzxcHouseInfoMapper;
@@ -40,6 +41,7 @@ public class SzxcHouseInfoServiceImpl implements ISzxcHouseInfoService
      * @return 房屋信息
      */
     @Override
+    @DataScope(deptAlias = "h")
     public List<SzxcHouseInfo> selectSzxcHouseInfoList(SzxcHouseInfo szxcHouseInfo)
     {
         return szxcHouseInfoMapper.selectSzxcHouseInfoList(szxcHouseInfo);
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcLdInfoServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcLdInfoServiceImpl.java
index 66ce002..30b0074 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcLdInfoServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcLdInfoServiceImpl.java
@@ -1,12 +1,14 @@
 package com.ruoyi.szxc.service.impl;
 
-import java.util.List;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.szxc.mapper.SzxcLdInfoMapper;
 import com.ruoyi.szxc.domain.SzxcLdInfo;
+import com.ruoyi.szxc.mapper.SzxcLdInfoMapper;
 import com.ruoyi.szxc.service.ISzxcLdInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 楼栋信息Service业务层处理
@@ -39,6 +41,7 @@ public class SzxcLdInfoServiceImpl implements ISzxcLdInfoService
      * @return 楼栋信息
      */
     @Override
+    @DataScope(deptAlias = "l")
     public List<SzxcLdInfo> selectSzxcLdInfoList(SzxcLdInfo szxcLdInfo)
     {
         return szxcLdInfoMapper.selectSzxcLdInfoList(szxcLdInfo);
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPlaceManageServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPlaceManageServiceImpl.java
index 9fb1c64..82d4284 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPlaceManageServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPlaceManageServiceImpl.java
@@ -1,12 +1,14 @@
 package com.ruoyi.szxc.service.impl;
 
-import java.util.List;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.szxc.mapper.SzxcPlaceManageMapper;
 import com.ruoyi.szxc.domain.SzxcPlaceManage;
+import com.ruoyi.szxc.mapper.SzxcPlaceManageMapper;
 import com.ruoyi.szxc.service.ISzxcPlaceManageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 场所管理Service业务层处理
@@ -39,6 +41,7 @@ public class SzxcPlaceManageServiceImpl implements ISzxcPlaceManageService
      * @return 场所管理
      */
     @Override
+    @DataScope(deptAlias = "p")
     public List<SzxcPlaceManage> selectSzxcPlaceManageList(SzxcPlaceManage szxcPlaceManage)
     {
         return szxcPlaceManageMapper.selectSzxcPlaceManageList(szxcPlaceManage);
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPublicActivilyServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPublicActivilyServiceImpl.java
index 8d12703..42225b6 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPublicActivilyServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPublicActivilyServiceImpl.java
@@ -1,12 +1,14 @@
 package com.ruoyi.szxc.service.impl;
 
-import java.util.List;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.szxc.mapper.SzxcPublicActivilyMapper;
 import com.ruoyi.szxc.domain.SzxcPublicActivily;
+import com.ruoyi.szxc.mapper.SzxcPublicActivilyMapper;
 import com.ruoyi.szxc.service.ISzxcPublicActivilyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 公益活动Service业务层处理
@@ -39,6 +41,7 @@ public class SzxcPublicActivilyServiceImpl implements ISzxcPublicActivilyService
      * @return 公益活动
      */
     @Override
+    @DataScope(deptAlias = "p")
     public List<SzxcPublicActivily> selectSzxcPublicActivilyList(SzxcPublicActivily szxcPublicActivily)
     {
         return szxcPublicActivilyMapper.selectSzxcPublicActivilyList(szxcPublicActivily);
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcSbzlServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcSbzlServiceImpl.java
index 8858480..b497f4a 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcSbzlServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcSbzlServiceImpl.java
@@ -1,12 +1,14 @@
 package com.ruoyi.szxc.service.impl;
 
-import java.util.List;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.szxc.mapper.SzxcSbzlMapper;
 import com.ruoyi.szxc.domain.SzxcSbzl;
+import com.ruoyi.szxc.mapper.SzxcSbzlMapper;
 import com.ruoyi.szxc.service.ISzxcSbzlService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 上报资料Service业务层处理
@@ -39,6 +41,7 @@ public class SzxcSbzlServiceImpl implements ISzxcSbzlService
      * @return 上报资料
      */
     @Override
+    @DataScope(deptAlias = "s")
     public List<SzxcSbzl> selectSzxcSbzlList(SzxcSbzl szxcSbzl)
     {
         return szxcSbzlMapper.selectSzxcSbzlList(szxcSbzl);
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXqInfoServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXqInfoServiceImpl.java
index bd5f2a3..f248c66 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXqInfoServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXqInfoServiceImpl.java
@@ -1,12 +1,14 @@
 package com.ruoyi.szxc.service.impl;
 
-import java.util.List;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.szxc.mapper.SzxcXqInfoMapper;
 import com.ruoyi.szxc.domain.SzxcXqInfo;
+import com.ruoyi.szxc.mapper.SzxcXqInfoMapper;
 import com.ruoyi.szxc.service.ISzxcXqInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 小区信息Service业务层处理
@@ -39,6 +41,7 @@ public class SzxcXqInfoServiceImpl implements ISzxcXqInfoService
      * @return 小区信息
      */
     @Override
+    @DataScope(deptAlias = "x")
     public List<SzxcXqInfo> selectSzxcXqInfoList(SzxcXqInfo szxcXqInfo)
     {
         return szxcXqInfoMapper.selectSzxcXqInfoList(szxcXqInfo);
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssServiceImpl.java
index d6d52c1..1eea738 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.szxc.service.impl;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.szxc.domain.SzxcZcss;
 import com.ruoyi.szxc.mapper.SzxcZcssMapper;
@@ -40,6 +41,7 @@ public class SzxcZcssServiceImpl implements ISzxcZcssService
      * @return 资产设施
      */
     @Override
+    @DataScope(deptAlias = "z")
     public List<SzxcZcss> selectSzxcZcssList(SzxcZcss szxcZcss)
     {
         return szxcZcssMapper.selectSzxcZcssList(szxcZcss);
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssxjServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssxjServiceImpl.java
index 484dfe1..b478446 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssxjServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssxjServiceImpl.java
@@ -1,12 +1,14 @@
 package com.ruoyi.szxc.service.impl;
 
-import java.util.List;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.szxc.mapper.SzxcZcssxjMapper;
 import com.ruoyi.szxc.domain.SzxcZcssxj;
+import com.ruoyi.szxc.mapper.SzxcZcssxjMapper;
 import com.ruoyi.szxc.service.ISzxcZcssxjService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 资产设施巡检Service业务层处理
@@ -39,6 +41,7 @@ public class SzxcZcssxjServiceImpl implements ISzxcZcssxjService
      * @return 资产设施巡检
      */
     @Override
+    @DataScope(deptAlias = "z")
     public List<SzxcZcssxj> selectSzxcZcssxjList(SzxcZcssxj szxcZcssxj)
     {
         return szxcZcssxjMapper.selectSzxcZcssxjList(szxcZcssxj);
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcBankcardInfoMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcBankcardInfoMapper.xml
index ec73077..08dec77 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcBankcardInfoMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcBankcardInfoMapper.xml
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectSzxcBankcardInfoList" parameterType="SzxcBankcardInfo" resultMap="SzxcBankcardInfoResult">
-        <include refid="selectSzxcBankcardInfoVo"/>
+        <include refid="selectSzxcBankcardInfoVo"/> as b
         <where>  
             <if test="ownerId != null "> and owner_id = #{ownerId}</if>
             <if test="ownerName != null  and ownerName != ''"> and owner_name like concat('%', #{ownerName}, '%')</if>
@@ -38,9 +38,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bankName != null  and bankName != ''"> and bank_name like concat('%', #{bankName}, '%')</if>
             <if test="bankAddress != null  and bankAddress != ''"> and bank_address = #{bankAddress}</if>
             <if test="defaultCard != null  and defaultCard != ''"> and default_card = #{defaultCard}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <!--<if test="deptId != null "> and dept_id = #{deptId}</if>-->
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.dataScope != null and params.dataScope !=''">
+                ${params.dataScope}
+            </if>
         </where>
     </select>
     
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcCarInfoMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcCarInfoMapper.xml
index 26501cd..d35eb96 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcCarInfoMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcCarInfoMapper.xml
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectSzxcCarInfoList" parameterType="SzxcCarInfo" resultMap="SzxcCarInfoResult">
-        <include refid="selectSzxcCarInfoVo"/>
+        <include refid="selectSzxcCarInfoVo"/> as c
         <where>  
             <if test="ownerId != null "> and owner_id = #{ownerId}</if>
             <if test="ownerName != null  and ownerName != ''"> and owner_name like concat('%', #{ownerName}, '%')</if>
@@ -42,6 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.dataScope != null and params.dataScope !=''">
+                ${params.dataScope}
+            </if>
         </where>
     </select>
     
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcDiscussCentreMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcDiscussCentreMapper.xml
index 7c20485..64171f6 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcDiscussCentreMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcDiscussCentreMapper.xml
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectSzxcDiscussCentreList" parameterType="SzxcDiscussCentre" resultMap="SzxcDiscussCentreResult">
-        <include refid="selectSzxcDiscussCentreVo"/>
+        <include refid="selectSzxcDiscussCentreVo"/> d
         <where>  
             <if test="title != null  and title != ''"> and title = #{title}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
@@ -39,6 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="params.dataScope != null and params.dataScope !=''">
+                ${params.dataScope}
+            </if>
         </where>
         order by create_time DESC
     </select>
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcDyManageMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcDyManageMapper.xml
index a29c6e6..df50e5f 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcDyManageMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcDyManageMapper.xml
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectSzxcDyManageList" parameterType="SzxcDyManage" resultMap="SzxcDyManageResult">
-        <include refid="selectSzxcDyManageVo"/>
+        <include refid="selectSzxcDyManageVo"/> d
         <where>  
             <if test="jmId != null "> and jm_id = #{jmId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
@@ -44,6 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="post != null  and post != ''"> and post = #{post}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.dataScope != null and params.dataScope !=''">
+                ${params.dataScope}
+            </if>
         </where>
     </select>
     
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHjAddressMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHjAddressMapper.xml
index afe2456..2020ca1 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHjAddressMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHjAddressMapper.xml
@@ -25,16 +25,19 @@
     </sql>
 
     <select id="selectSzxcHjAddressList" parameterType="SzxcHjAddress" resultMap="SzxcHjAddressResult">
-        <include refid="selectSzxcHjAddressVo"/>
+        <include refid="selectSzxcHjAddressVo"/>  as a
         <where>
             <if test="jmId != null "> and jm_id = #{jmId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
             <if test="acountNo != null "> and acount_no = #{acountNo}</if>
             <if test="hjAddress != null  and hjAddress != ''"> and hj_address = #{hjAddress}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+           <!-- <if test="deptId != null "> and dept_id = #{deptId}</if>-->
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.dataScope != null and params.dataScope !=''">
+                ${params.dataScope}
+            </if>
         </where>
     </select>
 
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHouseInfoMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHouseInfoMapper.xml
index a7efd33..caba13f 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHouseInfoMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHouseInfoMapper.xml
@@ -36,7 +36,7 @@
     </sql>
 
     <select id="selectSzxcHouseInfoList" parameterType="SzxcHouseInfo" resultMap="SzxcHouseInfoResult">
-        <include refid="selectSzxcHouseInfoVo"/>
+        <include refid="selectSzxcHouseInfoVo"/> as h
         <where>
             <if test="ownerId != null "> and owner_id = #{ownerId}</if>
             <if test="ownerName != null  and ownerName != ''"> and owner_name like concat('%', #{ownerName}, '%')</if>
@@ -54,9 +54,12 @@
             <if test="toiletType != null  and toiletType != ''"> and toilet_type = #{toiletType}</if>
             <if test="houseIntro != null  and houseIntro != ''"> and house_intro = #{houseIntro}</if>
             <if test="housePicture != null  and housePicture != ''"> and house_picture = #{housePicture}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+          <!--<if test="deptId != null "> and dept_id = #{deptId}</if>-->
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.dataScope != null and params.dataScope !=''">
+                ${params.dataScope}
+            </if>
         </where>
     </select>
 
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcLdInfoMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcLdInfoMapper.xml
index f2b0717..1b9dc2e 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcLdInfoMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcLdInfoMapper.xml
@@ -31,7 +31,7 @@
     </sql>
 
     <select id="selectSzxcLdInfoList" parameterType="SzxcLdInfo" resultMap="SzxcLdInfoResult">
-        <include refid="selectSzxcLdInfoVo"/>
+        <include refid="selectSzxcLdInfoVo"/> as  l
         <where>
             <if test="xqId != null "> and xq_id = #{xqId}</if>
             <if test="xqName != null  and xqName != ''"> and xq_name like concat('%', #{xqName}, '%')</if>
@@ -47,6 +47,9 @@
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.dataScope != null and params.dataScope !=''">
+                ${params.dataScope}
+            </if>
         </where>
     </select>
 
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPlaceManageMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPlaceManageMapper.xml
index 73e674c..8020739 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPlaceManageMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPlaceManageMapper.xml
@@ -33,7 +33,7 @@
     </sql>
 
     <select id="selectSzxcPlaceManageList" parameterType="SzxcPlaceManage" resultMap="SzxcPlaceManageResult">
-        <include refid="selectSzxcPlaceManageVo"/>
+        <include refid="selectSzxcPlaceManageVo"/> as p
         <where>
             <if test="csName != null  and csName != ''"> and cs_name like concat('%', #{csName}, '%')</if>
             <if test="hyType != null  and hyType != ''"> and hy_type = #{hyType}</if>
@@ -47,9 +47,12 @@
             <if test="yyqx != null  and yyqx != ''"> and yyqx = #{yyqx}</if>
             <if test="tyshxyCode != null  and tyshxyCode != ''"> and tyshxy_code = #{tyshxyCode}</if>
             <if test="yyzzPicture != null  and yyzzPicture != ''"> and yyzz_picture = #{yyzzPicture}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <!--<if test="deptId != null "> and dept_id = #{deptId}</if>-->
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.dataScope != null and params.dataScope !=''">
+                ${params.dataScope}
+            </if>
         </where>
     </select>
 
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPublicActivilyMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPublicActivilyMapper.xml
index d05ee8b..7b95f46 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPublicActivilyMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPublicActivilyMapper.xml
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectSzxcPublicActivilyList" parameterType="SzxcPublicActivily" resultMap="SzxcPublicActivilyResult">
-        <include refid="selectSzxcPublicActivilyVo"/>
+        <include refid="selectSzxcPublicActivilyVo"/> as p
         <where>  
             <if test="title != null  and title != ''"> and title = #{title}</if>
             <if test="leader != null  and leader != ''"> and leader = #{leader}</if>
@@ -37,9 +37,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null "> and start_time = #{startTime}</if>
             <if test="endTime != null "> and end_time = #{endTime}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <!--<if test="deptId != null "> and dept_id = #{deptId}</if>-->
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <!--数据范围过滤-->
+            <if test="params.dataScope != null and params.dataScope != ''">
+                ${params.dataScope}
+            </if>
         </where>
         order by create_time DESC
     </select>
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcSbzlMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcSbzlMapper.xml
index 5c3d928..8a1e6a4 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcSbzlMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcSbzlMapper.xml
@@ -25,16 +25,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectSzxcSbzlList" parameterType="SzxcSbzl" resultMap="SzxcSbzlResult">
-        <include refid="selectSzxcSbzlVo"/>
+        <include refid="selectSzxcSbzlVo"/> as s
         <where>  
             <if test="subName != null  and subName != ''"> and sub_name like concat('%', #{subName}, '%')</if>
             <if test="subDate != null "> and sub_date = #{subDate}</if>
             <if test="subType != null  and subType != ''"> and sub_type = #{subType}</if>
             <if test="title != null  and title != ''"> and title = #{title}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <!--<if test="deptId != null "> and dept_id = #{deptId}</if>-->
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.dataScope != null and params.dataScope !=''">
+                ${params.dataScope}
+            </if>
         </where>
     </select>
     
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXqInfoMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXqInfoMapper.xml
index 966f0b7..6959eb8 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXqInfoMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXqInfoMapper.xml
@@ -31,7 +31,7 @@
     </sql>
 
     <select id="selectSzxcXqInfoList" parameterType="SzxcXqInfo" resultMap="SzxcXqInfoResult">
-        <include refid="selectSzxcXqInfoVo"/>
+        <include refid="selectSzxcXqInfoVo"/> as x
         <where>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="xqType != null  and xqType != ''"> and xq_type = #{xqType}</if>
@@ -44,9 +44,12 @@
             <if test="xqAddress != null  and xqAddress != ''"> and xq_address = #{xqAddress}</if>
             <if test="buildDate != null "> and build_date = #{buildDate}</if>
             <if test="xqDescribe != null  and xqDescribe != ''"> and xq_describe = #{xqDescribe}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <!--<if test="deptId != null "> and dept_id = #{deptId}</if>-->
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.dataScope != null and params.dataScope !=''">
+                ${params.dataScope}
+            </if>
         </where>
     </select>
 
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssMapper.xml
index 089e32e..1553b76 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssMapper.xml
@@ -33,7 +33,7 @@
     </sql>
 
     <select id="selectSzxcZcssList" parameterType="SzxcZcss" resultMap="SzxcZcssResult">
-        <include refid="selectSzxcZcssVo"/>
+        <include refid="selectSzxcZcssVo"/> as z
         <where>
             <if test="zcName != null  and zcName != ''"> and zc_name like concat('%', #{zcName}, '%')</if>
             <if test="zcType != null  and zcType != ''"> and zc_type = #{zcType}</if>
@@ -50,6 +50,9 @@
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.dataScope != null and params.dataScope !=''">
+                ${params.dataScope}
+            </if>
         </where>
     </select>
 
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssxjMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssxjMapper.xml
index fa88f57..c7ed28e 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssxjMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssxjMapper.xml
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectSzxcZcssxjList" parameterType="SzxcZcssxj" resultMap="SzxcZcssxjResult">
-        <include refid="selectSzxcZcssxjVo"/>
+        <include refid="selectSzxcZcssxjVo"/> as z
         <where>  
             <if test="zcssId != null "> and zcss_id = #{zcssId}</if>
             <if test="zcName != null  and zcName != ''"> and zc_name like concat('%', #{zcName}, '%')</if>
@@ -50,6 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.dataScope != null and params.dataScope !=''">
+                ${params.dataScope}
+            </if>
         </where>
     </select>