bug修复以及数据分离操作

zhyc-module/src/main/resources/mapper/produce/other/ScCastrateMapper.xml

@@ -50,7 +50,9 @@
             </if>
             <if test="sc.sheepfold != null">and bs.sheepfold_id = #{sc.sheepfold}</if>
             <if test="sc.varietyId != null">and bs.variety_id = #{sc.varietyId}</if>
-            <if test="sc.technician != null and sc.technician != ''">and sc.technician like concat('%', #{sc.technician}, '%')</if>
+            <if test="sc.technician != null and sc.technician != ''">
+                and sc.technician like concat('%', #{sc.technician}, '%')
+            </if>
             <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.beginCreateTime != '' and sc.params.endCreateTime != null and sc.params.endCreateTime != ''">
                 and sc.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
             </if>
@@ -60,6 +62,7 @@
             <if test="sc.isDelete != null">
                 and bs.is_delete = #{sc.isDelete}
             </if>
+            ${sc.params.dataScope}
         </where>
         ORDER BY sc.create_time DESC
     </select>
@@ -80,6 +83,8 @@
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="eventDate != null">event_date,</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>
@@ -90,6 +95,8 @@
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="eventDate != null">#{eventDate},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="deptId != null">#{deptId},</if>
         </trim>
     </insert>
 
@@ -126,6 +133,5 @@
         WHERE bs.manage_tags LIKE CONCAT('%', #{query}, '%')
           AND bs.is_delete = 0
         ORDER BY bs.manage_tags
-            LIMIT 50
     </select>
 </mapper>