purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决系统配置的bug

Browse Source
This commit is contained in:
季圣华
2019-08-04 23:58:35 +08:00
parent 1e4675a23c
commit 99be262aad
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erp_web/pages/manage/systemConfig.html
View File

@@ -392,7 +392,7 @@
async: false, async: false,
data: ({ data: ({
id: systemConfigId, id: systemConfigId,
companyName: companyName name: companyName
}), }),
success: function (res) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200) {

4
src/main/java/com/jsh/erp/controller/SupplierController.java
View File

@@ -86,7 +86,7 @@ public class SupplierController {
List<Supplier> supplierList = supplierService.findBySelectCus(); List<Supplier> supplierList = supplierService.findBySelectCus();
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();
if (null != supplierList) { if (null != supplierList) {
boolean depotFlag = systemConfigService.getDepotFlag(); boolean customerFlag = systemConfigService.getCustomerFlag();
for (Supplier supplier : supplierList) { for (Supplier supplier : supplierList) {
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
//勾选判断1 //勾选判断1
@@ -96,7 +96,7 @@ public class SupplierController {
} catch (DataAccessException e) { } catch (DataAccessException e) {
logger.error(">>>>>>>>>>>>>>>>>查询用户对应的客户：存在异常！"); logger.error(">>>>>>>>>>>>>>>>>查询用户对应的客户：存在异常！");
} }
if (!depotFlag || flag) { if (!customerFlag || flag) {
item.put("id", supplier.getId()); item.put("id", supplier.getId());
item.put("supplier", supplier.getSupplier()); //客户名称 item.put("supplier", supplier.getSupplier()); //客户名称
dataArray.add(item); dataArray.add(item);