From 62ed476d0978a0326fbc7eaff7b11633ce61e7dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Tue, 27 Apr 2021 23:33:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E5=88=86?= =?UTF-8?q?=E9=85=8D=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8=E6=88=B7=E5=88=86?= =?UTF-8?q?=E9=85=8D=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/erp/controller/DepotController.java | 15 ++++++++++----- .../jsh/erp/controller/FunctionController.java | 7 +++---- .../jsh/erp/controller/SupplierController.java | 15 ++++++++++----- .../erp/service/functions/FunctionService.java | 2 +- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotController.java index 195fdbd8..11f6d87c 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotController.java @@ -67,7 +67,7 @@ public class DepotController { * @param request * @return */ - @PostMapping(value = "/findUserDepot") + @GetMapping(value = "/findUserDepot") public JSONArray findUserDepot(@RequestParam("UBType") String type, @RequestParam("UBKeyId") String keyId, HttpServletRequest request) throws Exception{ JSONArray arr = new JSONArray(); @@ -75,16 +75,21 @@ public class DepotController { List dataList = depotService.findUserDepot(); //开始拼接json数据 JSONObject outer = new JSONObject(); - outer.put("id", 1); - outer.put("text", "仓库列表"); - outer.put("state", "open"); + outer.put("id", 0); + outer.put("key", 0); + outer.put("value", 0); + outer.put("title", "仓库列表"); + outer.put("attributes", "仓库列表"); //存放数据json数组 JSONArray dataArray = new JSONArray(); if (null != dataList) { for (Depot depot : dataList) { JSONObject item = new JSONObject(); item.put("id", depot.getId()); - item.put("text", depot.getName()); + item.put("key", depot.getId()); + item.put("value", depot.getId()); + item.put("title", depot.getName()); + item.put("attributes", depot.getName()); //勾选判断1 Boolean flag = false; try { diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java index 58307fb2..1246e760 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java @@ -203,10 +203,9 @@ public class FunctionController { if (null != dataList) { for (Function function : dataList) { JSONObject item = new JSONObject(); - item.put("Id", function.getId()); - item.put("Name", function.getName()); - item.put("PushBtn", function.getPushBtn()); - item.put("op", 1); + item.put("id", function.getId()); + item.put("name", function.getName()); + item.put("pushBtn", function.getPushBtn()); dataArray.add(item); } } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java index 05847826..5797a3fa 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java @@ -246,7 +246,7 @@ public class SupplierController { * @param request * @return */ - @PostMapping(value = "/findUserCustomer") + @GetMapping(value = "/findUserCustomer") public JSONArray findUserCustomer(@RequestParam("UBType") String type, @RequestParam("UBKeyId") String keyId, HttpServletRequest request) throws Exception{ JSONArray arr = new JSONArray(); @@ -254,16 +254,21 @@ public class SupplierController { List dataList = supplierService.findUserCustomer(); //开始拼接json数据 JSONObject outer = new JSONObject(); - outer.put("id", 1); - outer.put("text", "客户列表"); - outer.put("state", "open"); + outer.put("id", 0); + outer.put("key", 0); + outer.put("value", 0); + outer.put("title", "客户列表"); + outer.put("attributes", "客户列表"); //存放数据json数组 JSONArray dataArray = new JSONArray(); if (null != dataList) { for (Supplier supplier : dataList) { JSONObject item = new JSONObject(); item.put("id", supplier.getId()); - item.put("text", supplier.getSupplier()); + item.put("key", supplier.getId()); + item.put("value", supplier.getId()); + item.put("title", supplier.getSupplier()); + item.put("attributes", supplier.getSupplier()); //勾选判断1 Boolean flag = false; try { diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/functions/FunctionService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/functions/FunctionService.java index eb5afdeb..7ef747e1 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/functions/FunctionService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/functions/FunctionService.java @@ -195,7 +195,7 @@ public class FunctionService { public List findByIds(String functionsIds)throws Exception{ List idList = StringUtil.strToLongList(functionsIds); FunctionExample example = new FunctionExample(); - example.createCriteria().andEnabledEqualTo(true).andIdIn(idList) + example.createCriteria().andEnabledEqualTo(true).andIdIn(idList).andPushBtnIsNotNull().andPushBtnNotEqualTo("") .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("Sort asc"); List list=null;