Merge branch 'developer' into 'master'

解绑删除

See merge request !111

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

@@ -7,11 +7,13 @@ import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.HandoverExternalDTO;
 import com.gic.haoban.manage.api.dto.HandoverStaffFriendCountDTO;
+import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.*;
 import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.service.HandoverService;
 import com.gic.haoban.manage.service.service.SecretSettingService;
+import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.gic.wechat.api.dto.qywx.QywxTransferCustomerInfoDTO;
 import com.gic.wechat.api.dto.qywx.QywxUnassignedInfoDTO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
@@ -69,6 +71,9 @@ public class HandoverServiceImpl implements HandoverService {
     @Autowired
     private TabHaobanClerkMainStoreRelatedMapper clerkMainStoreRelatedMapper;
 
+    @Autowired
+    private StaffClerkRelationService staffClerkRelationService;
+
     @Override
     public boolean saveHandover(String wxEnterpriseId, List<QywxUnassignedInfoDTO> infoList) {
         logger.info("saveHandover-保存离职基础数据：{}", wxEnterpriseId);
@@ -142,6 +147,10 @@ public class HandoverServiceImpl implements HandoverService {
         } else {
             handoverStaff.setHandoverStaffId(ToolUtil.randomUUID());
             handoverStaffMapper.insertSelective(handoverStaff);
+            //解绑
+            List<String> staffIds = new ArrayList<>();
+            staffIds.add(handoverStaff.getStaffId());
+            staffClerkRelationService.cleanStaffClerk(handoverStaff.getWxEnterpriseId(), staffIds);
         }
     }