From 5e0a9acf851e7d6284f1a7da3b209e7b4a77ba18 Mon Sep 17 00:00:00 2001
From: LegnaYet <1023868505@qq.com>
Date: Thu, 9 Apr 2020 14:23:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E3=80=81=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ic/department/controller/DepartmentController.java       | 5 +++--
 .../kiisoo/ic/employee/controller/EmployeeController.java    | 2 +-
 .../com/kiisoo/ic/wx/controller/CreateWechatController.java  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/department/controller/DepartmentController.java b/src/main/java/com/kiisoo/ic/department/controller/DepartmentController.java
index 5dae751..37b4a49 100644
--- a/src/main/java/com/kiisoo/ic/department/controller/DepartmentController.java
+++ b/src/main/java/com/kiisoo/ic/department/controller/DepartmentController.java
@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -34,8 +35,8 @@ public class DepartmentController extends BaseController {
     @ResponseBody
     public Map<String,Object> listDepartment(){
         try {
-            Boolean hasAdd = departmentService.listDepartment();
-            return data(hasAdd);
+            List<DepartmentDO> departments = departmentService.listDepartment();
+            return data(departments);
         }catch (Exception e){
             log.error("添加部门失败",e);
             return fail();
diff --git a/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java b/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java
index 3766ec7..5f32921 100644
--- a/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java
+++ b/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java
@@ -105,7 +105,7 @@ public class EmployeeController extends BaseController {
      * @return
      * @throws WxErrorException
      */
-    @RequestMapping(value = "add",method = RequestMethod.POST)
+    @RequestMapping(value = "delete",method = RequestMethod.POST)
     @ResponseBody
     public Map<String,Object> deleteUser(@RequestParam("cpUserId") Long cpUserId){
         try {
diff --git a/src/main/java/com/kiisoo/ic/wx/controller/CreateWechatController.java b/src/main/java/com/kiisoo/ic/wx/controller/CreateWechatController.java
index e0dac83..59641c5 100644
--- a/src/main/java/com/kiisoo/ic/wx/controller/CreateWechatController.java
+++ b/src/main/java/com/kiisoo/ic/wx/controller/CreateWechatController.java
@@ -32,7 +32,7 @@ public class CreateWechatController extends BaseController {
         employeeDO.setUserId(code);
         try {
             employeeService.addUser(employeeDO);
-        } catch (WxErrorException e) {
+        } catch (Exception e) {
             log.error("新增店铺创建店长微信失败",e);
         }
     }