Bläddra i källkod

Merge branch 'test' of jishutao/kede-server into prod

anderx 6 år sedan
förälder
incheckning
39a2035eed

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

@@ -653,7 +653,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(newStatus==0)params.put("newStatus", 0);
+		if(newStatus!=null&&newStatus==0)params.put("newStatus", 0);
 		else params.put("newStatus", tOrderDunMapper.selectByOrderNo(orderNo).isEmpty()?1:0);
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
 		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);