From e6729167aa3ca0c27b5369165b4f472090120374 Mon Sep 17 00:00:00 2001 From: zhujj Date: Wed, 23 Jan 2019 18:06:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=9C=BA=E6=9E=84=E3=80=81=E6=88=90=E5=91=98=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wx/cp/controller/WxDepartmentController.java | 4 ++-- .../ruoyi/wx/cp/controller/WxUserController.java | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ruoyi-weixin/src/main/java/com/ruoyi/wx/cp/controller/WxDepartmentController.java b/ruoyi-weixin/src/main/java/com/ruoyi/wx/cp/controller/WxDepartmentController.java index d33510fb0..87e46aaec 100644 --- a/ruoyi-weixin/src/main/java/com/ruoyi/wx/cp/controller/WxDepartmentController.java +++ b/ruoyi-weixin/src/main/java/com/ruoyi/wx/cp/controller/WxDepartmentController.java @@ -94,8 +94,8 @@ public class WxDepartmentController { } @Log(title = "删除组织机构", businessType = BusinessType.DELETE) - @GetMapping("/delete/{id}") - public AjaxResult delete(@PathVariable("id") Long id) { + @GetMapping("/delete") + public AjaxResult delete(Long id) { try { WxCpDepartmentService departmentService = WxCpConfiguration.getCpService(999999).getDepartmentService(); departmentService.delete(id); diff --git a/ruoyi-weixin/src/main/java/com/ruoyi/wx/cp/controller/WxUserController.java b/ruoyi-weixin/src/main/java/com/ruoyi/wx/cp/controller/WxUserController.java index 699ce914f..af4e6c612 100644 --- a/ruoyi-weixin/src/main/java/com/ruoyi/wx/cp/controller/WxUserController.java +++ b/ruoyi-weixin/src/main/java/com/ruoyi/wx/cp/controller/WxUserController.java @@ -94,7 +94,7 @@ public class WxUserController { return AjaxResult.error("全量新增成员成功【"+i+"】条,其余失败，错误码【"+ e.getError().getErrorCode()+"】，原因："+ ErrorCodeText.errorMsg(e.getError().getErrorCode())); } } - @Log(title = "获取成员", businessType = BusinessType.UPDATE) + @Log(title = "更新成员", businessType = BusinessType.UPDATE) @PostMapping("/update") public AjaxResult update(@RequestBody WxCpUser wxCpUser) { try { @@ -105,14 +105,24 @@ public class WxUserController { return AjaxResult.error("更新成员失败，错误码【"+ e.getError().getErrorCode()+"】，原因："+ ErrorCodeText.errorMsg(e.getError().getErrorCode())); } } - @Log(title = "删除成员", businessType = BusinessType.DELETE) @GetMapping("/delete") + public AjaxResult delete(String id) { + try { + WxCpUserService userService = WxCpConfiguration.getCpService(999999).getUserService(); + userService.delete(id); + return AjaxResult.success("删除成员成功"); + } catch (WxErrorException e) { + return AjaxResult.error("删除成员出错，错误码【"+ e.getError().getErrorCode()+"】，原因："+ ErrorCodeText.errorMsg(e.getError().getErrorCode())); + } + } + @Log(title = "批量删除成员", businessType = BusinessType.DELETE) + @GetMapping("/deleteByIds") public AjaxResult delete(@RequestBody String[] ids) { try { WxCpUserService userService = WxCpConfiguration.getCpService(999999).getUserService(); userService.delete(ids); - return AjaxResult.success("删除成员成功"); + return AjaxResult.success("批量删除成员"); } catch (WxErrorException e) { return AjaxResult.error("删除成员出错，错误码【"+ e.getError().getErrorCode()+"】，原因："+ ErrorCodeText.errorMsg(e.getError().getErrorCode())); }