|
|
@@ -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"));
|
|
|
|
