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 listDepartment(){ try { - Boolean hasAdd = departmentService.listDepartment(); - return data(hasAdd); + List 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 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); } }