Merge remote-tracking branch 'origin/new-exam' into new-exam

ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyNet.java

@@ -60,6 +60,9 @@ public class TdPropertyNet extends BaseEntity
     @Excel(name = "部门")
     private String part;
 
+
+    private Long deptId;
+
     public void setNetId(String netId) 
     {
         this.netId = netId;
@@ -160,6 +163,14 @@ public class TdPropertyNet extends BaseEntity
         return part;
     }
 
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -174,6 +185,7 @@ public class TdPropertyNet extends BaseEntity
             .append("terminalNum", getTerminalNum())
             .append("netRecoverdepart", getNetRecoverdepart())
             .append("part", getPart())
+            .append("deptId", getDeptId())
             .toString();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyNetServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.system.domain.count.PropertyManagerDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,6 +41,7 @@ public class TdPropertyNetServiceImpl implements ITdPropertyNetService
      * @param tdPropertyNet 涉密网络设备
      * @return 涉密网络设备
      */
+    @DataScope(deptAlias = "d")
     @Override
     public List<TdPropertyNet> selectTdPropertyNetList(TdPropertyNet tdPropertyNet)
     {

ruoyi-system/src/main/resources/mapper/system/TdPropertyNetMapper.xml

@@ -16,10 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="terminalNum"    column="terminal_num"    />
         <result property="netRecoverdepart"    column="net_recoverdepart"    />
         <result property="part"    column="part"    />
+        <result property="deptId"    column="dept_id"    />
     </resultMap>
 
     <sql id="selectTdPropertyNetVo">
-        select net_id, net_depart, net_user, net_date, framework, area, province, net_miji, terminal_num, net_recoverdepart, part from td_property_net
+        select net_id, net_depart, net_user, net_date, framework, area, province, net_miji, terminal_num, net_recoverdepart, part,dept_id from td_property_net d
     </sql>
 
     <select id="selectTdPropertyNetList" parameterType="TdPropertyNet" resultMap="TdPropertyNetResult">
@@ -35,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="terminalNum != null  and terminalNum != ''"> and terminal_num = #{terminalNum}</if>
             <if test="netRecoverdepart != null  and netRecoverdepart != ''"> and net_recoverdepart = #{netRecoverdepart}</if>
             <if test="part != null  and part != ''"> and part = #{part}</if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
     </select>
     
@@ -57,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="terminalNum != null">terminal_num,</if>
             <if test="netRecoverdepart != null">net_recoverdepart,</if>
             <if test="part != null">part,</if>
+            <if test="deptId != null">dept_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="netId != null">#{netId},</if>
@@ -70,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="terminalNum != null">#{terminalNum},</if>
             <if test="netRecoverdepart != null">#{netRecoverdepart},</if>
             <if test="part != null">#{part},</if>
+            <if test="deptId != null">#{deptId},</if>
          </trim>
     </insert>
 
@@ -86,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="terminalNum != null">terminal_num = #{terminalNum},</if>
             <if test="netRecoverdepart != null">net_recoverdepart = #{netRecoverdepart},</if>
             <if test="part != null">part = #{part},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
         </trim>
         where net_id = #{netId}
     </update>