bug修复以及数据分离操作

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

@@ -18,11 +18,15 @@
         <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="selectScTransGroupVo">
         SELECT tg.id,
                tg.sheep_id,
+               tg.user_id,
+               tg.dept_id,
                s.manage_tags          AS manageTags,
                tg.event_type          AS eventType,
                tg.trans_date          AS transDate,
@@ -38,9 +42,7 @@
                tg.create_time,
                sf_from.sheepfold_name AS foldFromName,
                sf_to.sheepfold_name   AS foldToName,
-               tg.technician,
-               st.id                  AS sheepTypeId,
-               st.name                AS sheepTypeName
+               tg.technician
         FROM sc_trans_group tg
                  LEFT JOIN bas_sheep s ON tg.sheep_id = s.id
                  LEFT JOIN bas_sheep_type st ON s.type_id = st.id
@@ -74,6 +76,7 @@
             <if test="sc.isDelete != null">
                 and s.is_delete = #{sc.isDelete}
             </if>
+            ${sc.params.dataScope}
         </where>
         ORDER BY tg.create_time DESC
     </select>
@@ -99,6 +102,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>
@@ -112,6 +117,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>