Merge branch 'master_xgh_我的客户迭代' into 'master'

Master xgh 我的客户迭代

See merge request !483

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

@@ -335,10 +335,10 @@ public class MessageApiServiceImpl implements MessageApiService {
             innerApiService.delCardByStaffId(staffId);
             //删除导购好友关联关系表
             this.staffDepartmentRelatedService.delByStaffid(staffId);
-            //删除员工表
-            this.staffService.delByStaffId(staffId);
             //员工解绑
             List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationApiService.listByStaffId(wxEnterpriseId, staffId);
+            //删除员工表-注意顺序
+            this.staffService.delByStaffId(staffId);
             if (CollectionUtils.isNotEmpty(staffClerkRelationDTOS)) {
                 for (StaffClerkRelationDTO staffClerkRelationDTO : staffClerkRelationDTOS) {
                     staffClerkRelationApiService.unbindByStaffAndClerkId(staffId, staffClerkRelationDTO.getClerkId(), ChannelCodeEnum.ADMIN_UNBIND.getCode(),wxEnterpriseId);