工作记录、巡查记录等添加数据权限

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcButieController.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.SzxcButie;
 import com.ruoyi.szxc.service.ISzxcButieService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.core.page.TableDataInfo;
+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 SzxcButieController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcButie szxcButie)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcButie.getDeptId()==null){
+            szxcButie.setDeptId(getDeptId());
+        }
+        szxcButie.setUserId(getUserId());
         return toAjax(szxcButieService.insertSzxcButie(szxcButie));
     }
 

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHelpController.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.SzxcHelp;
 import com.ruoyi.szxc.service.ISzxcHelpService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.core.page.TableDataInfo;
+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 SzxcHelpController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcHelp szxcHelp)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcHelp.getDeptId()==null){
+            szxcHelp.setDeptId(getDeptId());
+        }
+        szxcHelp.setUserId(getUserId());
         return toAjax(szxcHelpService.insertSzxcHelp(szxcHelp));
     }
 

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVisitRecardController.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.SzxcVisitRecard;
 import com.ruoyi.szxc.service.ISzxcVisitRecardService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.core.page.TableDataInfo;
+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 SzxcVisitRecardController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcVisitRecard szxcVisitRecard)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcVisitRecard.getDeptId()==null){
+            szxcVisitRecard.setDeptId(getDeptId());
+        }
+        szxcVisitRecard.setUserId(getUserId());
         return toAjax(szxcVisitRecardService.insertSzxcVisitRecard(szxcVisitRecard));
     }
 

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWishManageController.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.SzxcWishManage;
 import com.ruoyi.szxc.service.ISzxcWishManageService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.core.page.TableDataInfo;
+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 SzxcWishManageController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcWishManage szxcWishManage)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcWishManage.getDeptId()==null){
+            szxcWishManage.setDeptId(getDeptId());
+        }
+        szxcWishManage.setUserId(getUserId());
         return toAjax(szxcWishManageService.insertSzxcWishManage(szxcWishManage));
     }
 

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWorkRecardController.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.SzxcWorkRecard;
 import com.ruoyi.szxc.service.ISzxcWorkRecardService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.core.page.TableDataInfo;
+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 SzxcWorkRecardController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcWorkRecard szxcWorkRecard)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcWorkRecard.getDeptId()==null){
+            szxcWorkRecard.setDeptId(getDeptId());
+        }
+        szxcWorkRecard.setUserId(getUserId());
         return toAjax(szxcWorkRecardService.insertSzxcWorkRecard(szxcWorkRecard));
     }
 

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXcRecardController.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.SzxcXcRecard;
 import com.ruoyi.szxc.service.ISzxcXcRecardService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.core.page.TableDataInfo;
+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 SzxcXcRecardController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcXcRecard szxcXcRecard)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcXcRecard.getDeptId()==null){
+            szxcXcRecard.setDeptId(getDeptId());
+        }
+        szxcXcRecard.setUserId(getUserId());
         return toAjax(szxcXcRecardService.insertSzxcXcRecard(szxcXcRecard));
     }
 

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcButieServiceImpl.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.SzxcButie;
 import com.ruoyi.szxc.mapper.SzxcButieMapper;
@@ -40,6 +41,7 @@ public class SzxcButieServiceImpl implements ISzxcButieService
      * @return 补贴管理
      */
     @Override
+    @DataScope(deptAlias = "b")
     public List<SzxcButie> selectSzxcButieList(SzxcButie szxcButie)
     {
         return szxcButieMapper.selectSzxcButieList(szxcButie);

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHelpServiceImpl.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.SzxcHelpMapper;
 import com.ruoyi.szxc.domain.SzxcHelp;
+import com.ruoyi.szxc.mapper.SzxcHelpMapper;
 import com.ruoyi.szxc.service.ISzxcHelpService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 帮办事Service业务层处理
@@ -39,6 +41,7 @@ public class SzxcHelpServiceImpl implements ISzxcHelpService
      * @return 帮办事
      */
     @Override
+    @DataScope(deptAlias = "h")
     public List<SzxcHelp> selectSzxcHelpList(SzxcHelp szxcHelp)
     {
         return szxcHelpMapper.selectSzxcHelpList(szxcHelp);

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmInfoServiceImpl.java

@@ -52,6 +52,7 @@ public class SzxcJmInfoServiceImpl implements ISzxcJmInfoService
     public List<SzxcJmInfo> selectSzxcJmInfoList(SzxcJmInfo szxcJmInfo)
     {
         List<SzxcJmInfo> szxcJmInfos = szxcJmInfoMapper.selectSzxcJmInfoList(szxcJmInfo);
+        //按出生年月计算出年龄
        szxcJmInfos.forEach(info->{
            Date bornDate = info.getBornDate();
            int ageByBirth = GetAgeByBirthdayUtil.getAgeByBirth(bornDate);

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVisitRecardServiceImpl.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.SzxcVisitRecardMapper;
 import com.ruoyi.szxc.domain.SzxcVisitRecard;
+import com.ruoyi.szxc.mapper.SzxcVisitRecardMapper;
 import com.ruoyi.szxc.service.ISzxcVisitRecardService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 走访记录Service业务层处理
@@ -39,6 +41,7 @@ public class SzxcVisitRecardServiceImpl implements ISzxcVisitRecardService
      * @return 走访记录
      */
     @Override
+    @DataScope(deptAlias = "v")
     public List<SzxcVisitRecard> selectSzxcVisitRecardList(SzxcVisitRecard szxcVisitRecard)
     {
         return szxcVisitRecardMapper.selectSzxcVisitRecardList(szxcVisitRecard);

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWishManageServiceImpl.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.SzxcWishManage;
 import com.ruoyi.szxc.mapper.SzxcWishManageMapper;
@@ -40,6 +41,7 @@ public class SzxcWishManageServiceImpl implements ISzxcWishManageService
      * @return 心愿管理
      */
     @Override
+    @DataScope(deptAlias = "w")
     public List<SzxcWishManage> selectSzxcWishManageList(SzxcWishManage szxcWishManage)
     {
         return szxcWishManageMapper.selectSzxcWishManageList(szxcWishManage);

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWorkRecardServiceImpl.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.SzxcWorkRecardMapper;
 import com.ruoyi.szxc.domain.SzxcWorkRecard;
+import com.ruoyi.szxc.mapper.SzxcWorkRecardMapper;
 import com.ruoyi.szxc.service.ISzxcWorkRecardService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 工作记录Service业务层处理
@@ -39,6 +41,7 @@ public class SzxcWorkRecardServiceImpl implements ISzxcWorkRecardService
      * @return 工作记录
      */
     @Override
+    @DataScope(deptAlias = "w")
     public List<SzxcWorkRecard> selectSzxcWorkRecardList(SzxcWorkRecard szxcWorkRecard)
     {
         return szxcWorkRecardMapper.selectSzxcWorkRecardList(szxcWorkRecard);

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXcRecardServiceImpl.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.SzxcXcRecardMapper;
 import com.ruoyi.szxc.domain.SzxcXcRecard;
+import com.ruoyi.szxc.mapper.SzxcXcRecardMapper;
 import com.ruoyi.szxc.service.ISzxcXcRecardService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 巡查记录Service业务层处理
@@ -39,6 +41,7 @@ public class SzxcXcRecardServiceImpl implements ISzxcXcRecardService
      * @return 巡查记录
      */
     @Override
+    @DataScope(deptAlias = "x")
     public List<SzxcXcRecard> selectSzxcXcRecardList(SzxcXcRecard szxcXcRecard)
     {
         return szxcXcRecardMapper.selectSzxcXcRecardList(szxcXcRecard);

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml

@@ -34,7 +34,7 @@
     </sql>
 
     <select id="selectSzxcButieList" parameterType="SzxcButie" resultMap="SzxcButieResult">
-        <include refid="selectSzxcButieVo"/>
+        <include refid="selectSzxcButieVo"/> as b
         <where>
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="xmTitle != null  and xmTitle != ''"> and xm_title = #{xmTitle}</if>
@@ -50,9 +50,13 @@
             <if test="auditResult != null  and auditResult != ''"> and audit_result = #{auditResult}</if>
             <if test="auditReason != null  and auditReason != ''"> and audit_reason = #{auditReason}</if>
             <if test="auditDeptid != null "> and audit_deptid = #{auditDeptid}</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>
 

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHelpMapper.xml

@@ -33,7 +33,7 @@
     </sql>
 
     <select id="selectSzxcHelpList" parameterType="SzxcHelp" resultMap="SzxcHelpResult">
-        <include refid="selectSzxcHelpVo"/>
+        <include refid="selectSzxcHelpVo"/>  as h
         <where>
             <if test="subName != null  and subName != ''"> and sub_name like concat('%', #{subName}, '%')</if>
             <if test="subDate != null "> and sub_date = #{subDate}</if>
@@ -50,6 +50,10 @@
             <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>
 

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml

@@ -45,7 +45,7 @@
     </sql>
 
     <select id="selectSzxcJmInfoList" parameterType="SzxcJmInfo" resultMap="SzxcJmInfoResult">
-        <include refid="selectSzxcJmInfoVo"/>
+        <include refid="selectSzxcJmInfoVo"/>  as j
         <where>
             <!--<if test="deptId != null "> and dept_id = #{deptId}</if>-->
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
@@ -76,9 +76,9 @@
             <if test="off != null  and off != ''"> and off = #{off}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <!-- <if test="deptId != null "> and dept_id = #{deptId}</if>-->
-            <if test="deptId != null and deptId != 0">
+            <!--<if test="deptId != null and deptId != 0">
-                AND (d.dept_id = #{deptId} OR d.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
+                AND (j.dept_id = #{deptId} OR j.dept_id IN ( SELECT s.dept_id FROM sys_dept s WHERE find_in_set(#{deptId}, ancestors) ))
-            </if>
+            </if>-->
             <!-- 数据范围过滤 -->
             <if test="params.dataScope != null and params.dataScope !=''">
                 ${params.dataScope}

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVisitRecardMapper.xml

@@ -38,7 +38,7 @@
     </sql>
 
     <select id="selectSzxcVisitRecardList" parameterType="SzxcVisitRecard" resultMap="SzxcVisitRecardResult">
-        <include refid="selectSzxcVisitRecardVo"/>
+        <include refid="selectSzxcVisitRecardVo"/>   as v
         <where>
             <if test="visiterName != null  and visiterName != ''"> and visiter_name like concat('%', #{visiterName}, '%')</if>
             <if test="submitDate != null "> and submit_date = #{submitDate}</if>
@@ -58,9 +58,13 @@
             <if test="auditResult != null  and auditResult != ''"> and audit_result = #{auditResult}</if>
             <if test="auditReason != null  and auditReason != ''"> and audit_reason = #{auditReason}</if>
             <if test="shRemark != null  and shRemark != ''"> and sh_remark = #{shRemark}</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>
 

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWishManageMapper.xml

@@ -36,7 +36,7 @@
     </sql>
 
     <select id="selectSzxcWishManageList" parameterType="SzxcWishManage" resultMap="SzxcWishManageResult">
-        <include refid="selectSzxcWishManageVo"/>
+        <include refid="selectSzxcWishManageVo"/> as w
         <where>
             <if test="applyName != null  and applyName != ''"> and apply_name like concat('%', #{applyName}, '%')</if>
             <if test="applyPhone != null  and applyPhone != ''"> and apply_phone = #{applyPhone}</if>
@@ -54,8 +54,15 @@
             <if test="auditResult != null  and auditResult != ''"> and audit_result = #{auditResult}</if>
             <if test="auditReason != null  and auditReason != ''"> and audit_reason = #{auditReason}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+           <!-- <if test="deptId != null "> and dept_id = #{deptId}</if>-->
+            <!--<if test="deptId != null and deptId != 0">
+                AND (w.dept_id = #{deptId} OR w.dept_id IN ( SELECT s.dept_id FROM sys_dept s WHERE find_in_set(#{deptId}, ancestors) ))
+            </if>-->
             <if test="userId != null "> and user_id = #{userId}</if>
+            <!--数据范围过滤-->
+            <if test="params.dataScope != null and params.dataScope != ''">
+                ${params.dataScope}
+            </if>
         </where>
     </select>
 

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml

@@ -35,7 +35,7 @@
     </sql>
 
     <select id="selectSzxcWorkRecardList" parameterType="SzxcWorkRecard" resultMap="SzxcWorkRecardResult">
-        <include refid="selectSzxcWorkRecardVo"/>
+        <include refid="selectSzxcWorkRecardVo"/>   w
         <where>
             <if test="workerName != null  and workerName != ''"> and worker_name like concat('%', #{workerName}, '%')</if>
             <if test="submitDate != null "> and submit_date = #{submitDate}</if>
@@ -52,9 +52,13 @@
             <if test="auditResult != null  and auditResult != ''"> and audit_result = #{auditResult}</if>
             <if test="auditReason != null  and auditReason != ''"> and audit_reason = #{auditReason}</if>
             <if test="shRemark != null  and shRemark != ''"> and sh_remark = #{shRemark}</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>
 

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXcRecardMapper.xml

@@ -39,7 +39,7 @@
     </sql>
 
     <select id="selectSzxcXcRecardList" parameterType="SzxcXcRecard" resultMap="SzxcXcRecardResult">
-        <include refid="selectSzxcXcRecardVo"/>
+        <include refid="selectSzxcXcRecardVo"/>  as x
         <where>
             <if test="xcName != null  and xcName != ''"> and xc_name like concat('%', #{xcName}, '%')</if>
             <if test="submitDate != null "> and submit_date = #{submitDate}</if>
@@ -60,9 +60,13 @@
             <if test="auditResult != null  and auditResult != ''"> and audit_result = #{auditResult}</if>
             <if test="auditReason != null  and auditReason != ''"> and audit_reason = #{auditReason}</if>
             <if test="shRemark != null  and shRemark != ''"> and sh_remark = #{shRemark}</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>