Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/product/controller/BizCarrierController.java

@@ -41,6 +41,7 @@ public class BizCarrierController extends BaseController {
 
     @Resource
     private IBizDayworkCarrierService bizDayworkCarrierService;
+
     @Resource
     private IBizCarrierCategoryService bizCarrierCategoryService;
 

src/main/resources/mybatis/business/product/BizDayworkItemMapper.xml

@@ -66,7 +66,15 @@
         <collection property="consults" ofType="cn.ezhizao.project.business.product.domain.BizDayworkItemConsult" column="id" select="getSortConsultList"/>
     </resultMap>
     <select id="getSortListByDayworkId" resultMap="BizSortListResult">
-        select t1.*,t2.process_alias from biz_daywork_item t1 left join biz_process t2 on t1.process_id = t2.id where t1.daywork_id = #{dayworkId}  and t1.dept_name = '分选' and t1.deleted = 0 and t2.deleted = 0  and t1.status &lt;4
+        select
+            t1.*,t2.process_alias
+        from biz_daywork_item t1 left join biz_process t2
+            on t1.process_id = t2.id
+        where t1.daywork_id = #{dayworkId}
+          and t1.is_sort = 1
+          and t1.deleted = 0
+          and t2.deleted = 0
+          and t1.status &lt;4
         order by t1.process_step_number,t1.create_time
     </select>
     <select id="getSortRejectList" resultType="cn.ezhizao.project.business.product.domain.BizDayworkItemReject">