anderx лет назад: 6
Родитель
Сommit
d2e948900a

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

@@ -442,7 +442,8 @@
   </select>
   <select id="salesmanOrderOutsourceCount" resultType="java.lang.Integer">
   select count(*) from t_order_outsource a left join t_order_new b on a.order_no=b.order_no 
-  left join `user` c on b.buyer_id=c.id where 1=1 left join admin d on b.salesman_id=d.id
+  left join `user` c on b.buyer_id=c.id  left join admin d on b.salesman_id=d.id
+  where 1=1 and b.outsource=1
   	and d.department_id in
   	<foreach close=")" collection="deps" item="deps" open="(" separator=",">
 	 #{deps.id}

+ 2 - 2
src/main/java/com/goafanti/order/controller/OutsourceOrgApiController.java

@@ -150,8 +150,8 @@ public class OutsourceOrgApiController extends CertifyApiController {
 	/**
 	 * 外包审核
 	 */
-	@RequestMapping(value="/auditOutsource", method = RequestMethod.GET)
-	public Result auditOutsource(OrderOutsourceDtails o){
+	@RequestMapping(value="/auditOutsourceNew", method = RequestMethod.POST)
+	public Result auditOutsourceNew(OrderOutsourceDtails o){
 		Result res=new Result();
 		if (o.getId()==null||o.getRefundStatus()==null||o.getRemarks()==null) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "外包信息","外包信息"));

+ 4 - 4
src/main/resources/props/config_local.properties

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.12
-#avatar.host=//sb.jishutao.com
+static.host=//sb.jishutao.com/1.1.12
+avatar.host=//sb.jishutao.com
 
 #连测试
-avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.12
+#avatar.host=//static.jishutao.com
+#static.host=//static.jishutao.com/1.1.12
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload