cq

master/src/main/java/com/ruoyi/project/plant/mapper/TTargetlistMapper.java

@@ -37,6 +37,7 @@ public interface TTargetlistMapper
      * @param tTargetlist 目标录入
      * @return 目标录入集合
      */
+    @DataScope(deptAlias = "d")
     public List<TTargetlist> selectListMeasures(TTargetlist tTargetlist);
 
     /**

master/src/main/resources/mybatis/plant/TTargetmeasuresMapper.xml

@@ -44,10 +44,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="measures != null  and measures != ''"> and measures = #{measures}</if>
             <if test="responsible != null  and responsible != ''"> and responsible = #{responsible}</if>
             <if test="expectedDate != null "> and expected_date = #{expectedDate}</if>
-            and d.del_flag = 0 order by targetlist_id asc, d.id asc
+            and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by targetlist_id asc, d.id asc
     </select>
     
     <select id="selectTTargetmeasuresById" parameterType="Long" resultMap="TTargetmeasuresResult">

master/src/main/resources/mybatis/plant/TTargetreviewMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectTTargetreviewById" parameterType="Long" resultMap="TTargetreviewResult">
-        select d.id, l.item, l.description, l.targets, d.firstquarter, d.halfyear, d.threequarter, d.annual, l.year, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.firstquarter_status, d.halfyear_status, d.threequarter_status, d.annual_status, l.parent_id, s.dept_name, d.deviation_info, d.list_id from t_targetreview d
+        select d.id, l.item, l.description, l.targets, d.firstquarter, d.halfyear, d.threequarter, d.annual, l.year, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.firstquarter_status, d.halfyear_status, d.threequarter_status, d.annual_status, l.parent_id, s.dept_name, d.deviation_info, d.list_id, d.deviation_info from t_targetreview d
       left join sys_dept s on s.dept_id = d.dept_id
       left join t_targetlist l on l.id = d.list_id
         where d.id = #{id}