楚江ERP：订单明细开启权限控制

@@ -67,7 +67,7 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
         Assert.greaterThanZero(pageSize);
         Assert.greaterThanZero(pageSize);
 
 
         PageHelperUtil.startPage(pageIndex, pageSize);
         PageHelperUtil.startPage(pageIndex, pageSize);
-        List<OrderDetailReport> datas = this.query(vo);
+        List<OrderDetailReport> datas = getBaseMapper().authQuery(vo);
 
 
         return PageResultUtil.convert(new PageInfo<>(datas));
         return PageResultUtil.convert(new PageInfo<>(datas));
     }
     }

@@ -24,10 +24,19 @@ public interface OrderDetailReportMapper extends BaseMapper<OrderDetailReport> {
      * @param vo
      * @param vo
      * @return
      * @return
      */
      */
+    List<OrderDetailReport> query(@Param("vo") QueryOrderDetailReportVo vo);
+
+    /**
+     * 查询列表
+     * 开启权限控制
+     *
+     * @param vo    查询条件
+     * @return      List<OrderDetailReport>
+     */
     @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
     @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
-            @DataPermission(template = "order", alias = "tb")
+            @DataPermission(template = "order", alias = "t")
     })
     })
-    List<OrderDetailReport> query(@Param("vo") QueryOrderDetailReportVo vo);
+    List<OrderDetailReport> authQuery(@Param("vo") QueryOrderDetailReportVo vo);
 
 
     /**
     /**
      * 查询
      * 查询

@@ -142,7 +142,7 @@
         </where>
         </where>
     </select>
     </select>
 
 
-    <select id="query" resultMap="OrderDetailReport">
+    <sql id="OrderDetailReport_query_sql">
         SELECT *
         SELECT *
         FROM (
         FROM (
         SELECT
         SELECT
@@ -263,5 +263,13 @@
         t.order_no ASC,
         t.order_no ASC,
         t.purchase_order_line_id ASC,
         t.purchase_order_line_id ASC,
         t.show_order ASC
         t.show_order ASC
+    </sql>
+
+    <select id="query" resultMap="OrderDetailReport">
+        <include refid="OrderDetailReport_query_sql"/>
+    </select>
+
+    <select id="authQuery" resultMap="OrderDetailReport">
+        <include refid="OrderDetailReport_query_sql"/>
     </select>
     </select>
 </mapper>
 </mapper>