更新好友

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<String,Object> updateUser(@RequestBody EmployeeDO employee){
+    public Map<String,Object> 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);

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)
      */

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<PrivilageCpUserDepartmentDO> 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;
     }

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
      */

src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml

@@ -3,8 +3,16 @@
 <mapper namespace="com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper">
 
     <select id="selectCpUserByShops" resultType="com.kiisoo.ic.store.entity.StoreUserDTO">
-
-        select distinct pcu.cp_user_id as cpUserId,pcu.qr_code as qrCodeAction,pcus.store_id as id,pcu.id as userId ,t.name,t.code
+        select distinct
+        pcu.cp_user_id as cpUserId,
+        pcu.qr_code as qrCodeAction,
+        pcus.store_id as id,
+        pcu.id as userId ,
+        pcu.name as cpUserName ,
+        pcu.mobile as mobile ,
+        pcu.alias as alias ,
+        t.name,
+        t.code
         from poi_store t join privilage_domain_entity t2 on t.id = t2.entity_id and t2.type = 3
         left join privilage_cp_user_store pcus on t.id = pcus.store_id
         left join privilage_cp_user pcu on pcus.cp_user_id = pcu.id and pcu.status in (1,4)
@@ -17,8 +25,7 @@
                 </foreach>
             </if>
         </where>
-        order by  pcu.id desc
-
+        order by pcu.id desc
     </select>
 
     <select id="selectOneByCpUserId" resultType="java.lang.Long">