wuwen 4 年之前
父節點
當前提交
36125fc371
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      src/main/java/com/ssj/sys/controller/FxController.java

+ 4 - 4
src/main/java/com/ssj/sys/controller/FxController.java

@@ -2139,11 +2139,11 @@ public class FxController  extends BaseController {
 	        HttpSession session = request.getSession();
 	        Admin admin =(Admin) session.getAttribute("admin");
 			Merchant merchant=merchantService.getMerchantByPosCode(admin.getLoginName());
-	        if(merchant!=null && !merchant.getOrgCode().equals("SSJ-FX")){
-				 params.put("from_merchant_id", merchant.getId());
-			}else{
+//	        if(merchant!=null && !merchant.getOrgCode().equals("SSJ-FX")){
+//				 params.put("from_merchant_id", merchant.getId());
+//			}else{
 				params.put("from_merchant_id", "");
-			}
+//			}
 	        params.put("type", request.getParameter("type")==null?"1":request.getParameter("type"));
 	        params.put("batchCode", request.getParameter("batchCode")==null?"":request.getParameter("batchCode"));