Browse Source

派单管理分配BUG修复

anderx 7 years ago
parent
commit
44742157d8

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

@@ -1133,7 +1133,7 @@
   	and a.approval = 1 and  a.order_status=2
   	</if>
   	<if test="specially == 4">
-  	and a.process_status in (4,5,6)
+  	and a.process_status in (4,5,6,99)
   	and a.order_status not in(5,7)
   	</if>
   	<if test="specially == 5">

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

@@ -278,7 +278,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
-		if (specially!=null&&(specially==0||specially==1||specially==2||specially==5)) {
+		if (specially!=null&&(specially==0||specially==1||specially==2||specially==4||specially==5)) {
 			//0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询
 			if (specially!=3&&specially!=4) {
 				params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());