删除好办成员时需要删除导购关联关系

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -37,7 +37,6 @@ import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.entity.*;
-import com.gic.haoban.manage.service.errorcode.HaoBanErrCode;
 import com.gic.haoban.manage.service.errorcode.QywxErrCode;
 import com.gic.haoban.manage.service.pojo.bo.StaffListBO;
 import com.gic.haoban.manage.service.service.*;
@@ -55,6 +54,7 @@ import com.gic.wechat.api.service.qywx.QywxOrderApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -281,11 +281,29 @@ public class StaffApiServiceImpl implements StaffApiService {
             phoneNumber = arr[1];
         }
         String openUserid = getOpenUserid(wxUserId, dkCorpid, qwDTO);
-        TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(wxUserId, openUserid, wxEnterpriseId);
-        if (staff != null) {
-            staffService.delOtherStaffByWxUserId(staff.getWxUserId(), staff.getStaffId(), wxEnterpriseId);
+        TabHaobanStaff staff = new TabHaobanStaff();
+        List<StaffDTO> staffDTOList = staffService.listByUserIdsAndWxEnterpriseId(Lists.newArrayList(wxUserId,openUserid), wxEnterpriseId);
+        if (CollUtil.isNotEmpty(staffDTOList) && staffDTOList.size()>1) {
+            //只保留一个staff
+            for (int i =0;i<staffDTOList.size()-1;i++){
+                StaffDTO dto = staffDTOList.get(i);
+                String staffId = dto.getStaffId();
+                // 员工解绑
+                List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationService
+                        .listByStaffId(wxEnterpriseId, staffId);
+                if (CollectionUtils.isNotEmpty(staffClerkRelationDTOS)) {
+                    for (StaffClerkRelationDTO staffClerkRelationDTO : staffClerkRelationDTOS) {
+                        staffClerkRelationService.delBind(staffId, staffClerkRelationDTO.getClerkId(),
+                                ChannelCodeEnum.ADMIN_UNBIND.getCode(),null, wxEnterpriseId);
+                    }
+                }
+                this.staffService.delByStaffId(staffId);
+                staffDTOList.remove(i);
+            }
+        }
+        if (CollUtil.isNotEmpty(staffDTOList)){
+            staff = JSONObject.parseObject(JSONObject.toJSONString(staffDTOList.get(0)), TabHaobanStaff.class);
         }
-        staff = (staff == null ? new TabHaobanStaff() : staff);
         staff.setWxUserId(wxUserId);
         if (StringUtils.isNotBlank(openUserid)) {
             staff.setWxOpenUseId(openUserid);