From ab31aed43425b1fece71b10db690709aae91b6b8 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, 3 Nov 2020 00:42:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsh/erp/controller/UserController.java    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/main/java/com/jsh/erp/controller/UserController.java b/src/main/java/com/jsh/erp/controller/UserController.java
index ea7e8479..bffe2473 100644
--- a/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/src/main/java/com/jsh/erp/controller/UserController.java
@@ -259,6 +259,31 @@ public class UserController {
         return res;
     }
 
+    /**
+     * 用户列表，用于用户下拉框
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @GetMapping(value = "/getUserList")
+    public JSONArray getUserList(HttpServletRequest request)throws Exception {
+        JSONArray dataArray = new JSONArray();
+        try {
+            List<User> dataList = userService.getUser();
+            if (null != dataList) {
+                for (User user : dataList) {
+                    JSONObject item = new JSONObject();
+                    item.put("id", user.getId());
+                    item.put("userName", user.getUsername());
+                    dataArray.add(item);
+                }
+            }
+        } catch(Exception e){
+            e.printStackTrace();
+        }
+        return dataArray;
+    }
+
     /**
      * create by: cjl
      * description: