bug修复以及数据分离操作

zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml

@@ -19,12 +19,16 @@
         <result property="comment" column="comment"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="deptId" column="dept_id"/>
     </resultMap>
 
     <sql id="selectScTransitionInfoVo">
         SELECT t.*,
                bv.variety        AS varietyName,
                bs.manage_tags    AS manageTags,
+               t.user_id,
+               t.dept_id,
                sf.sheepfold_name AS sheepfoldName,
                t.event_type      AS eventType,
                t.transition_date AS transitionDate,
@@ -77,6 +81,7 @@
             <if test="sc.currentRanchId != null">
                 and bs.ranch_id = #{sc.currentRanchId}
             </if>
+            ${sc.params.dataScope}
         </where>
         ORDER BY t.create_time DESC
     </select>
@@ -101,6 +106,8 @@
             <if test="comment != null">comment,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="deptId != null">dept_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sheepId != null">#{sheepId},</if>
@@ -115,6 +122,8 @@
             <if test="comment != null">#{comment},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="deptId != null">#{deptId},</if>
         </trim>
     </insert>
 
@@ -171,6 +180,6 @@
         FROM bas_sheep bs
         WHERE bs.manage_tags LIKE CONCAT('%', #{query}, '%')
           AND bs.is_delete = 0
-        ORDER BY bs.manage_tags LIMIT 50
+        ORDER BY bs.manage_tags
     </select>
 </mapper>