Browse Source

修改财务派单、收款结算列表

anderx 6 years ago
parent
commit
0143cb2dfa

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

@@ -558,8 +558,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			flag++;
 		}
 		for (TOrderTask t2 : list) {
-			if (t2.getMain()==1&&t.getId()!=t2.getId()) {
-				flag++;
+			if (t2.getMain()==1&&t.getId()==t2.getId()) {
+				flag--;
 			}
 		}
 		if (flag>1) {

+ 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