bug

src/main/java/com/chinaitop/depot/rp/controller/BusinessRpReportController.java

@@ -229,8 +229,7 @@ public class BusinessRpReportController {
     @ApiOperation(value="轮换计划接收列表", notes = "查询数据列表，支持分页")
     public PageInfo<Map<String,Object>> getRecList(BusinessRpReportPageParam businessRpReportPageParam) throws Exception {
         System.out.println("----------------------------");
-        System.out.println(businessRpReportPageParam);
-        
+
         List<Map<String,Object>> list = businessRpReportService.getRecList(businessRpReportPageParam);
         PageInfo<Map<String,Object>> pageInfo = new PageInfo<>(list);
         return pageInfo;

src/main/java/com/chinaitop/depot/rp/mapper/BusinessRpReportMapper.xml

@@ -461,7 +461,7 @@
         inner JOIN province_all.biz_rp_issuance a ON c.id = a.rp_report_id
         LEFT JOIN  depot_qh.business_rp_outbound d on d.rp_report_id = c.id
         LEFT JOIN province_all.biz_unit_info b on c.unit_info_id = b.id
-        where 1=1
+        where c.status =1
         <if test="pageParam.unitName !=null and pageParam.unitName!=''">
             and b.dwmc like concat("%",#{pageParam.unitName},"%")
         </if>
@@ -474,12 +474,13 @@
         <if test="pageParam.unitId !=null and pageParam.unitId!=''">
             and c.unit_info_id = #{pageParam.unitId}
         </if>
-        <if test="pageParam.unitId !=null and pageParam.unitId!=''">
+        <if test="pageParam.orgId !=null and pageParam.orgId!=''">
             and d.org_Id = #{pageParam.orgId}
         </if>
         <!-- <if test="pageParam.lsxzName !=null and pageParam.lsxzName!=''">
              and a.dwmc like concat("%",#{pageParam.lsxzName},"%")
          </if>-->
+        group by  cast(c.rotation_year as char)
         ORDER BY c.report_time desc
     </select>
     <select id="getRpReportByById" resultMap="BaseResultMap2">