From 180293558dfbaa5e63d7d17ac2817c78441102cf Mon Sep 17 00:00:00 2001
From: hansha <bdqn_hansha@163.com>
Date: Mon, 18 Mar 2024 16:47:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szxc/controller/SzxcJmInfoController.java |  5 +
 .../ruoyi/szxc/service/ISzxcJmTagService.java | 61 ------------
 .../service/impl/SzxcJmInfoServiceImpl.java   |  2 +
 .../service/impl/SzxcJmTagServiceImpl.java    | 93 -------------------
 .../impl/SzxcPersonTagServiceImpl.java        |  3 +-
 .../mapper/szxc/SzxcJmInfoMapper.xml          | 11 ++-
 .../resources/mapper/szxc/SzxcJmTagMapper.xml | 57 ++++++++++++
 7 files changed, 75 insertions(+), 157 deletions(-)
 delete mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmTagService.java
 delete mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmTagServiceImpl.java
 create mode 100644 ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmTagMapper.xml

diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmInfoController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmInfoController.java
index 3ebd9db..a97100e 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmInfoController.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmInfoController.java
@@ -71,6 +71,11 @@ public class SzxcJmInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SzxcJmInfo szxcJmInfo)
     {
+        //根据前端传递过来的部门存储，如果没传则存储当前用户的部门
+        if(szxcJmInfo.getDeptId()==null){
+            szxcJmInfo.setDeptId(getDeptId());
+        }
+        szxcJmInfo.setUserId(getUserId());
         return toAjax(szxcJmInfoService.insertSzxcJmInfo(szxcJmInfo));
     }
 
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmTagService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmTagService.java
deleted file mode 100644
index b27df04..0000000
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmTagService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.ruoyi.szxc.service;
-
-import java.util.List;
-import com.ruoyi.szxc.domain.SzxcJmTag;
-
-/**
- * 居民标签关联Service接口
- * 
- * @author hs
- * @date 2024-03-16
- */
-public interface ISzxcJmTagService 
-{
-    /**
-     * 查询居民标签关联
-     * 
-     * @param jmId 居民标签关联主键
-     * @return 居民标签关联
-     */
-    public SzxcJmTag selectSzxcJmTagByJmId(Long jmId);
-
-    /**
-     * 查询居民标签关联列表
-     * 
-     * @param szxcJmTag 居民标签关联
-     * @return 居民标签关联集合
-     */
-    public List<SzxcJmTag> selectSzxcJmTagList(SzxcJmTag szxcJmTag);
-
-    /**
-     * 新增居民标签关联
-     * 
-     * @param szxcJmTag 居民标签关联
-     * @return 结果
-     */
-    public int insertSzxcJmTag(SzxcJmTag szxcJmTag);
-
-    /**
-     * 修改居民标签关联
-     * 
-     * @param szxcJmTag 居民标签关联
-     * @return 结果
-     */
-    public int updateSzxcJmTag(SzxcJmTag szxcJmTag);
-
-    /**
-     * 批量删除居民标签关联
-     * 
-     * @param jmIds 需要删除的居民标签关联主键集合
-     * @return 结果
-     */
-    public int deleteSzxcJmTagByJmIds(Long[] jmIds);
-
-    /**
-     * 删除居民标签关联信息
-     * 
-     * @param jmId 居民标签关联主键
-     * @return 结果
-     */
-    public int deleteSzxcJmTagByJmId(Long jmId);
-}
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmInfoServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmInfoServiceImpl.java
index 6735c49..f3ea76f 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmInfoServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmInfoServiceImpl.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.SzxcJmInfo;
 import com.ruoyi.szxc.mapper.SzxcJmInfoMapper;
@@ -40,6 +41,7 @@ public class SzxcJmInfoServiceImpl implements ISzxcJmInfoService
      * @return 居民信息
      */
     @Override
+    @DataScope(deptAlias = "j")
     public List<SzxcJmInfo> selectSzxcJmInfoList(SzxcJmInfo szxcJmInfo)
     {
         return szxcJmInfoMapper.selectSzxcJmInfoList(szxcJmInfo);
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmTagServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmTagServiceImpl.java
deleted file mode 100644
index f6800cf..0000000
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmTagServiceImpl.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.ruoyi.szxc.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.szxc.mapper.SzxcJmTagMapper;
-import com.ruoyi.szxc.domain.SzxcJmTag;
-import com.ruoyi.szxc.service.ISzxcJmTagService;
-
-/**
- * 居民标签关联Service业务层处理
- * 
- * @author hs
- * @date 2024-03-16
- */
-@Service
-public class SzxcJmTagServiceImpl implements ISzxcJmTagService 
-{
-    @Autowired
-    private SzxcJmTagMapper szxcJmTagMapper;
-
-    /**
-     * 查询居民标签关联
-     * 
-     * @param jmId 居民标签关联主键
-     * @return 居民标签关联
-     */
-    @Override
-    public SzxcJmTag selectSzxcJmTagByJmId(Long jmId)
-    {
-        return szxcJmTagMapper.selectSzxcJmTagByJmId(jmId);
-    }
-
-    /**
-     * 查询居民标签关联列表
-     * 
-     * @param szxcJmTag 居民标签关联
-     * @return 居民标签关联
-     */
-    @Override
-    public List<SzxcJmTag> selectSzxcJmTagList(SzxcJmTag szxcJmTag)
-    {
-        return szxcJmTagMapper.selectSzxcJmTagList(szxcJmTag);
-    }
-
-    /**
-     * 新增居民标签关联
-     * 
-     * @param szxcJmTag 居民标签关联
-     * @return 结果
-     */
-    @Override
-    public int insertSzxcJmTag(SzxcJmTag szxcJmTag)
-    {
-        return szxcJmTagMapper.insertSzxcJmTag(szxcJmTag);
-    }
-
-    /**
-     * 修改居民标签关联
-     * 
-     * @param szxcJmTag 居民标签关联
-     * @return 结果
-     */
-    @Override
-    public int updateSzxcJmTag(SzxcJmTag szxcJmTag)
-    {
-        return szxcJmTagMapper.updateSzxcJmTag(szxcJmTag);
-    }
-
-    /**
-     * 批量删除居民标签关联
-     * 
-     * @param jmIds 需要删除的居民标签关联主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSzxcJmTagByJmIds(Long[] jmIds)
-    {
-        return szxcJmTagMapper.deleteSzxcJmTagByJmIds(jmIds);
-    }
-
-    /**
-     * 删除居民标签关联信息
-     * 
-     * @param jmId 居民标签关联主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSzxcJmTagByJmId(Long jmId)
-    {
-        return szxcJmTagMapper.deleteSzxcJmTagByJmId(jmId);
-    }
-}
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPersonTagServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPersonTagServiceImpl.java
index aa5fda8..ac5b8aa 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPersonTagServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPersonTagServiceImpl.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.SzxcPersonTag;
 import com.ruoyi.szxc.mapper.SzxcPersonTagMapper;
@@ -41,7 +42,7 @@ public class SzxcPersonTagServiceImpl implements ISzxcPersonTagService
      */
     @Override
   //  @DataScope(deptAlias = "d", userAlias= "d")
-    //@DataScope(deptAlias = "d")
+    @DataScope(deptAlias = "d")
     public List<SzxcPersonTag> selectSzxcPersonTagList(SzxcPersonTag szxcPersonTag)
     {
         return szxcPersonTagMapper.selectSzxcPersonTagList(szxcPersonTag);
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml
index 3776956..66edb96 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml
@@ -44,9 +44,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectSzxcJmInfoList" parameterType="SzxcJmInfo" resultMap="SzxcJmInfoResult">
-        <include refid="selectSzxcJmInfoVo"/>
+        <include refid="selectSzxcJmInfoVo"/>  j
         <where>  
-            <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 (d.dept_id = #{deptId} OR d.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
+            </if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="oldName != null  and oldName != ''"> and old_name like concat('%', #{oldName}, '%')</if>
@@ -73,6 +76,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sameHeadIds != null  and sameHeadIds != ''"> and same_head_ids = #{sameHeadIds}</if>
             <if test="off != null  and off != ''"> and off = #{off}</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/SzxcJmTagMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmTagMapper.xml
new file mode 100644
index 0000000..358281a
--- /dev/null
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmTagMapper.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.szxc.mapper.SzxcJmTagMapper">
+
+    <resultMap type="SzxcJmTag" id="SzxcJmTagResult">
+        <result property="jmId"    column="jm_id"    />
+        <result property="tagId"    column="tag_id"    />
+    </resultMap>
+
+    <sql id="selectSzxcJmTagVo">
+        select jm_id, tag_id from szxc_jm_tag
+    </sql>
+
+    <select id="selectSzxcJmTagList" parameterType="SzxcJmTag" resultMap="SzxcJmTagResult">
+        <include refid="selectSzxcJmTagVo"/>
+        <where>
+        </where>
+    </select>
+
+    <select id="selectSzxcJmTagByJmId" parameterType="Long" resultMap="SzxcJmTagResult">
+        <include refid="selectSzxcJmTagVo"/>
+        where jm_id = #{jmId}
+    </select>
+
+    <insert id="insertSzxcJmTag" parameterType="SzxcJmTag">
+        insert into szxc_jm_tag
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jmId != null">jm_id,</if>
+            <if test="tagId != null">tag_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jmId != null">#{jmId},</if>
+            <if test="tagId != null">#{tagId},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSzxcJmTag" parameterType="SzxcJmTag">
+        update szxc_jm_tag
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="tagId != null">tag_id = #{tagId},</if>
+        </trim>
+        where jm_id = #{jmId}
+    </update>
+
+    <delete id="deleteSzxcJmTagByJmId" parameterType="Long">
+        delete from szxc_jm_tag where jm_id = #{jmId}
+    </delete>
+
+    <delete id="deleteSzxcJmTagByJmIds" parameterType="String">
+        delete from szxc_jm_tag where jm_id in
+        <foreach item="jmId" collection="array" open="(" separator="," close=")">
+            #{jmId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file