anderx лет назад: 2
Родитель
Сommit
39f77e83b3

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -784,7 +784,7 @@
       a.service_project serviceProject,o.examine_name examineName
     from t_order_new o left join department d on o.order_dep = d.id left join `user` u on o.buyer_id = u.id left join t_order_mid a on o.order_no=a.order_no
     left join (select * from  t_order_outsource where type=0) too on o.order_no=too.order_no where delete_sign in(0,2) and approval in(0,1,2,4,5,7,8)
-    and outsource=   #{o.outsource,jdbcType=INTEGER}
+    where delete_sign in(0,2) and approval in(0,1,2,4,5,7,8) and outsource=  #{o.outsource,jdbcType=INTEGER}
     <if test="o.processStatus == 3">
       and o.process_status = #{o.processStatus,jdbcType=INTEGER}
     </if>

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -400,7 +400,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if (dep.getApproval()==1){
 				nb.setProcessState(OrderChangeProcess.TPSH.getCode());
 			}else {
-				addOrderChangeLog("部门特批审核人未设置,跳过特批审核", 2, nb.getOrderNo(), nb.getId(),date,AFTConstants.SUPERADMIN_ID);
+				addOrderChangeLog("部门特批审核人未设置,系统自动通过", 2, nb.getOrderNo(), nb.getId(),date,AFTConstants.SUPERADMIN_ID);
 				completeChange(remarks,nb);
 				return true;
 			}