anderx лет назад: 4
Родитель
Сommit
a7b774f918

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

@@ -857,7 +857,12 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     </if>
     <if test="specially ==8">
       and a.process_status > 4
+  	    <if test="uid !=null">
       and a.buyer_id = #{uid}
+        </if>
+      <if test="aid !=null">
+        and a.salesman_id = #{aid,jdbcType=VARCHAR}
+      </if>
     </if>
   	<if test="outsource != null">
   	and a.outsource= #{outsource,jdbcType=INTEGER}

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

@@ -591,6 +591,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			if(specially==4) params.put("distribution",distribution);
 			// 计算出所有本部门及所属部门的ID
 			if(specially==1||specially==5) params.put("deps", orderService.selectMyDeps());
+		}else if(specially==8){
+			if (StringUtils.isNotBlank(uid)) params.put("uid", uid);
+			if (StringUtils.isNotBlank(aid)) params.put("aid", aid);
 		}
 			params.put("specially",specially);
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
@@ -604,7 +607,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
 		if (StringUtils.isNotBlank(contractStart)) params.put("contractStart", contractStart);
 		if (StringUtils.isNotBlank(contractEnd)) params.put("contractEnd", contractEnd+" 23:59:59");
-		if (StringUtils.isNotBlank(uid)) params.put("uid", uid);
 		params.put("outsource", outsource);
 		Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, pageNo, pageSize);
 		return p;