diff --git a/erp_web/pages/manage/systemConfig.html b/erp_web/pages/manage/systemConfig.html index 965f10a0..505590c6 100644 --- a/erp_web/pages/manage/systemConfig.html +++ b/erp_web/pages/manage/systemConfig.html @@ -392,7 +392,7 @@ async: false, data: ({ id: systemConfigId, - companyName: companyName + name: companyName }), success: function (res) { if(res && res.code === 200) { diff --git a/src/main/java/com/jsh/erp/controller/SupplierController.java b/src/main/java/com/jsh/erp/controller/SupplierController.java index 0f7a9413..0058d6b6 100644 --- a/src/main/java/com/jsh/erp/controller/SupplierController.java +++ b/src/main/java/com/jsh/erp/controller/SupplierController.java @@ -86,7 +86,7 @@ public class SupplierController { List supplierList = supplierService.findBySelectCus(); JSONArray dataArray = new JSONArray(); if (null != supplierList) { - boolean depotFlag = systemConfigService.getDepotFlag(); + boolean customerFlag = systemConfigService.getCustomerFlag(); for (Supplier supplier : supplierList) { JSONObject item = new JSONObject(); //勾选判断1 @@ -96,7 +96,7 @@ public class SupplierController { } catch (DataAccessException e) { logger.error(">>>>>>>>>>>>>>>>>查询用户对应的客户:存在异常!"); } - if (!depotFlag || flag) { + if (!customerFlag || flag) { item.put("id", supplier.getId()); item.put("supplier", supplier.getSupplier()); //客户名称 dataArray.add(item);