From 45cf9bb8fbf63e9fc03bb313a0e275f48b932c3e Mon Sep 17 00:00:00 2001 From: yechenhao Date: Sun, 31 May 2020 00:54:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A5=BD=E5=8F=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EmployeeController.java | 6 ++-- .../kiisoo/ic/employee/entity/EmployeeDO.java | 4 +++ .../ic/employee/service/EmployeeService.java | 29 ++++++++----------- .../kiisoo/ic/store/entity/StoreUserDTO.java | 12 ++++++++ .../mapper/PrivilageCpUserStoreDOMapper.xml | 15 +++++++--- 5 files changed, 43 insertions(+), 23 deletions(-) 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 2076fbe..5eb1091 100644 --- a/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java +++ b/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java @@ -197,9 +197,11 @@ public class EmployeeController extends BaseController { */ @RequestMapping(value = "update",method = RequestMethod.POST) @ResponseBody - public Map updateUser(@RequestBody EmployeeDO employee){ + public Map updateUser(@RequestParam("id")Long id,@RequestParam("mobile")String mobile, + @RequestParam("cpUserName")String cpUserName,@RequestParam("cpUserId")String cpUserId, + @RequestParam("alias")String alias){ try { - Boolean hasAdd = employeeService.updateUser(employee); + Boolean hasAdd = employeeService.updateUser(id,cpUserId,mobile,cpUserName,alias); return data(hasAdd); }catch (Exception e){ log.error("修改用户失败",e); diff --git a/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java b/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java index 15db79a..634daa4 100644 --- a/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java +++ b/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java @@ -28,6 +28,10 @@ public class EmployeeDO { * 员工名 */ private String name; + /** + * 企业微信名称 + */ + private String cpUserName; /** * 成员所属部门id列表,不超过20个(企业微信部门id，非数据库部门id) */ diff --git a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java index 31eaabf..c1590aa 100644 --- a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java +++ b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java @@ -33,6 +33,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestParam; import javax.imageio.ImageIO; import javax.servlet.ServletOutputStream; @@ -262,31 +263,25 @@ public class EmployeeService { * @throws WxErrorException */ @Transactional(rollbackFor = Exception.class) - public Boolean updateUser(EmployeeDO employee) throws Exception { + public Boolean updateUser(Long id, String cpUserId,String mobile,String cpUserName,String alias) throws Exception { PrivilageCpUserDO privilageCpUserDO = new PrivilageCpUserDO(); - BeanUtils.copyProperties(employee, privilageCpUserDO); - privilageCpUserDO.setCpUserId(employee.getUserId()); - + privilageCpUserDO.setId(id); + privilageCpUserDO.setMobile(mobile); + privilageCpUserDO.setName(cpUserName); + privilageCpUserDO.setAlias(alias); int update = privilageCpUserDOMapper.updateById(privilageCpUserDO); if (update == 0) { throw new Exception("修改成员失败"); } - //维护部门关系——删除原有部门关系 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(DATABASE_CP_USER_ID_KEY, privilageCpUserDO.getId()); - privilageCpUserDepartmentDOMapper.delete(queryWrapper); - - Long[] departIds = employee.getDepartIds(); - Integer[] orders = employee.getOrders(); - Integer[] isLeaderInDept = employee.getIsLeaderInDept(); - for (int i = 0; i < departIds.length; i++) { - PrivilageCpUserDepartmentDO relation = new PrivilageCpUserDepartmentDO(privilageCpUserDO.getId(), departIds[i], orders[i], isLeaderInDept[i]); - privilageCpUserDepartmentDOMapper.insert(relation); - } - //成功则添加用户到企业微信 + EmployeeDO employee = new EmployeeDO(); + employee.setName(cpUserName); + employee.setId(id); + employee.setAlias(alias); + employee.setUserId(cpUserId); + employee.setMobile(mobile); qwMailListManageService.updateUser(employee); return true; } diff --git a/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java b/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java index a73a0cd..6c583aa 100644 --- a/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java +++ b/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java @@ -18,6 +18,18 @@ public class StoreUserDTO extends PoiStore{ * 企业微信账号 */ private String cpUserId; + /** + * 企业微信账号 + */ + private String cpUserName; + /** + * 别名 + */ + private String alias; + /** + * 手机号 + */ + private String mobile; /** * privilage_cp_user 主键id */ diff --git a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml index 6fc9eb1..47a0582 100644 --- a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml +++ b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml @@ -3,8 +3,16 @@