经验交流代码提交

qianhe-ydsj/src/main/java/com/qianhe/domain/JygxWzgl.java

@@ -74,7 +74,7 @@ public class JygxWzgl extends BaseEntity
 
     /** 预留1 */
     @Excel(name = "预留1")
-    private String yl1;
+    private String deptId;
 
     /** 预留2 */
     @Excel(name = "预留2")
@@ -226,15 +226,15 @@ public class JygxWzgl extends BaseEntity
     {
         return wzsj;
     }
-    public void setYl1(String yl1)
-    {
-        this.yl1 = yl1;
+
+    public String getDeptId() {
+        return deptId;
     }
 
-    public String getYl1()
-    {
-        return yl1;
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
     }
+
     public void setYl2(String yl2)
     {
         this.yl2 = yl2;
@@ -297,7 +297,7 @@ public class JygxWzgl extends BaseEntity
             .append("fjlx", getFjlx())
             .append("wzzz", getWzzz())
             .append("wzsj", getWzsj())
-            .append("yl1", getYl1())
+            .append("deptId", getDeptId())
             .append("yl2", getYl2())
             .append("yl3", getYl3())
             .append("yl4", getYl4())

qianhe-ydsj/src/main/java/com/qianhe/service/impl/JygxWzglServiceImpl.java

@@ -3,6 +3,8 @@ package com.qianhe.service.impl;
 import java.math.BigInteger;
 import java.security.SecureRandom;
 import java.util.List;
+
+import com.qianhe.common.annotation.DataScope;
 import com.qianhe.common.utils.DateUtils;
 import com.qianhe.common.utils.SecurityUtils;
 import com.qianhe.domain.JygxWzgl;
@@ -52,6 +54,7 @@ public class JygxWzglServiceImpl implements IJygxWzglService
      * @return 经验共享-文章管理
      */
     @Override
+    @DataScope(deptAlias = "d")
     public List<JygxWzgl> selectJygxWzglList(JygxWzgl jygxWzgl)
     {
         return jygxWzglMapper.selectJygxWzglList(jygxWzgl);

qianhe-ydsj/src/main/resources/mapper/JygxWzglMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fjlx"    column="fjlx"    />
         <result property="wzzz"    column="wzzz"    />
         <result property="wzsj"    column="wzsj"    />
-        <result property="yl1"    column="yl1"    />
+        <result property="deptId"    column="dept_id"    />
         <result property="yl2"    column="yl2"    />
         <result property="yl3"    column="yl3"    />
         <result property="yl4"    column="yl4"    />
@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectJygxWzglVo">
-        select wzid, px, xxly, lxid, lxmc, wznr, wzbt, shzt, fjmc, fjdz, fjlx, wzzz, wzsj, yl1, yl2, yl3, yl4, yl5, create_by, create_time, update_by, update_time, remark, ydsl from jygx_wzgl
+        select wzid, px, xxly, lxid, lxmc, wznr, wzbt, shzt, fjmc, fjdz, fjlx, wzzz, wzsj, dept_id, yl2, yl3, yl4, yl5, create_by, create_time, update_by, update_time, remark, ydsl from jygx_wzgl d
     </sql>
 
     <select id="selectJygxWzglList" parameterType="JygxWzgl" resultMap="JygxWzglResult">
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fjlx != null  and fjlx != ''"> and fjlx = #{fjlx}</if>
             <if test="wzzz != null  and wzzz != ''"> and wzzz = #{wzzz}</if>
             <if test="wzsj != null "> and wzsj = #{wzsj}</if>
-            <if test="yl1 != null  and yl1 != ''"> and yl1 = #{yl1}</if>
+            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
             <if test="yl2 != null  and yl2 != ''"> and yl2 = #{yl2}</if>
             <if test="yl3 != null  and yl3 != ''"> and yl3 = #{yl3}</if>
             <if test="yl4 != null  and yl4 != ''"> and yl4 = #{yl4}</if>
@@ -57,9 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ydsl != null "> and ydsl = #{ydsl}</if>
             and lxmc != "syxw"
         </where>
-        ORDER BY ifnull (px,999999), wzsj desc
-
 
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        ORDER BY ifnull (px,999999), wzsj desc
     </select>
 
 
@@ -76,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fjlx != null  and fjlx != ''"> and fjlx = #{fjlx}</if>
             <if test="wzzz != null  and wzzz != ''"> and wzzz = #{wzzz}</if>
             <if test="wzsj != null "> and wzsj = #{wzsj}</if>
-            <if test="yl1 != null  and yl1 != ''"> and yl1 = #{yl1}</if>
+            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
             <if test="yl2 != null  and yl2 != ''"> and yl2 = #{yl2}</if>
             <if test="yl3 != null  and yl3 != ''"> and yl3 = #{yl3}</if>
             <if test="yl4 != null  and yl4 != ''"> and yl4 = #{yl4}</if>
@@ -108,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fjlx != null">fjlx,</if>
             <if test="wzzz != null">wzzz,</if>
             <if test="wzsj != null">wzsj,</if>
-            <if test="yl1 != null">yl1,</if>
+            <if test="deptId != null">dept_id,</if>
             <if test="yl2 != null">yl2,</if>
             <if test="yl3 != null">yl3,</if>
             <if test="yl4 != null">yl4,</if>
@@ -134,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fjlx != null">#{fjlx},</if>
             <if test="wzzz != null">#{wzzz},</if>
             <if test="wzsj != null">#{wzsj},</if>
-            <if test="yl1 != null">#{yl1},</if>
+            <if test="deptId != null">#{deptId},</if>
             <if test="yl2 != null">#{yl2},</if>
             <if test="yl3 != null">#{yl3},</if>
             <if test="yl4 != null">#{yl4},</if>
@@ -163,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fjlx != null">fjlx = #{fjlx},</if>
             <if test="wzzz != null">wzzz = #{wzzz},</if>
             <if test="wzsj != null">wzsj = #{wzsj},</if>
-            <if test="yl1 != null">yl1 = #{yl1},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="yl2 != null">yl2 = #{yl2},</if>
             <if test="yl3 != null">yl3 = #{yl3},</if>
             <if test="yl4 != null">yl4 = #{yl4},</if>