From 9e328b797e1bf9109d0a2185045176ac61735c06 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期六, 15 一月 2022 08:33:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/java/zy/cloud/wms/manager/controller/CstmrController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java b/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
index 44e6716..8bbe89f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
@@ -41,7 +41,9 @@
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+// wrapper.orderBy("create_time",false);
+ wrapper.orderBy("id",false);
return R.ok(cstmrService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -131,4 +133,24 @@
return R.ok();
}
+ /**
+ * 杩斿洖缁欏墠绔偣鍑讳笅鎷夋鐨勬暟鎹�
+ * @return
+ */
+ @RequestMapping("/cstmrUuid/auth")
+ public R cstmrUuid(){
+ List<Cstmr> cstmrs = cstmrService.selectList(null);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (Cstmr cstmr : cstmrs) {
+ Map<String,Object> content = new HashMap<>();
+ content.put("id",cstmr.getId());
+ content.put("value",cstmr.getName());
+ result.add(content);
+ }
+
+
+
+ return R.ok(result);
+ }
+
}
--
Gitblit v1.9.1