Merge remote-tracking branch 'origin/master'

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

@@ -1747,6 +1747,8 @@ public TableDataInfo examineList(@RequestBody BizProcessInspecion bizProcessInsp
         //出厂检创建时不添加检察员id
         if(processInspecion.getId() !=null) {
             processInspecion.setReviewerId(SecurityUtils.getLoginUser().getUserId());
+        }else{
+            processInspecion.setReviewerId(processInspecion.getReviewerId());
         }
         processInspecion.setType("factoryInspection");
         if (processInspecion.getStartTime() == null) {

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

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 <!--    AND DATE_FORMAT( start_time, '%Y-%m-%d' ) =${timeString}-->
     <select id="getList" parameterType="BizProcessInspecion" resultMap="BizProcessInspecionResult">
-        SELECT t1.*,t2.nick_name as technicianName FROM biz_process_inspecion t1 left join sys_user t2 on t1.reviewer_id = t2.user_id
+        SELECT distinct t1.*,t2.nick_name as technicianName FROM biz_process_inspecion t1 left join sys_user t2 on t1.reviewer_id = t2.user_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0
             AND t1.return_receipt_detail_id =0
@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null ">AND t1.status = #{status}</if>
             <if test="inspectionChamberId != null ">AND t1.inspection_chamber_id = #{inspectionChamberId}</if>
             <if test="keyword != null  and keyword != '' ">AND (t1.lot_code LIKE CONCAT('%',#{keyword},'%') OR carrier_code LIKE CONCAT('%',#{keyword},'%') OR
-            t1.product_description LIKE CONCAT('%',#{keyword},'%'))
+            t1.product_description LIKE CONCAT('%',#{keyword},'%') OR inspection_carrier_code LIKE CONCAT('%',#{keyword},'%'))
             </if>
             <if test="isAuto != null  ">AND t1.is_auto = #{isAuto}</if>