导购解绑

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

@@ -107,7 +107,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
     public boolean delBind(String oldClerkId, String optStaffId, int channelCode, String newClerkId, String wxEnterpriseId) {
         boolean changeClerkFlag = StringUtils.isNotEmpty(newClerkId) ;
         logger.info("导购解绑/换导购={},oldClerkId={},optStaffId={}",changeClerkFlag,oldClerkId,optStaffId);
-        if(StringUtils.isNotEmpty(optStaffId) && "-1".equals(optStaffId)) {
+        if(StringUtils.isNotEmpty(optStaffId) && !"-1".equals(optStaffId)) {
             TabHaobanStaff staff =  this.staffService.selectById(optStaffId) ;
             if(null != staff) {
                 wxEnterpriseId = staff.getWxEnterpriseId() ;

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

@@ -395,7 +395,7 @@ public class MessageApiServiceImpl implements MessageApiService {
                     .listByStaffId(wxEnterpriseId, staffId);
             if (CollectionUtils.isNotEmpty(staffClerkRelationDTOS)) {
                 for (StaffClerkRelationDTO staffClerkRelationDTO : staffClerkRelationDTOS) {
-                    staffClerkRelationApiService.unbindByStaffAndClerkId(staffId, staffClerkRelationDTO.getClerkId(),
+                    staffClerkRelationApiService.unbindByStaffAndClerkId("-1", staffClerkRelationDTO.getClerkId(),
                             ChannelCodeEnum.QW_DEL_UNBIND.getCode(), wxEnterpriseId);
                 }
             }

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

@@ -22,6 +22,7 @@ import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.api.service.AuditApiService;
 import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.service.config.Config;
+import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
 import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
@@ -76,6 +77,8 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
     private HmQrcodeService hmQrcodeService;
     @Autowired
     private StoreRangeService storeRangeService;
+    @Autowired
+    private StaffMapper staffMapper ;
 
     @Override
     public void bindLogMq(String params) {
@@ -355,7 +358,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
         Page<StaffClerkBindLogDetailDTO> retList = staffClerkBindLogService.pageBindLog(wxEnterpriseId, enterpriseId, optType, search, pageInfo);
         if (CollectionUtils.isNotEmpty(retList.getResult())) {
             retList.getResult().forEach(item -> {
-                TabHaobanStaff haobanStaff = staffService.selectById(item.getStaffId());
+                TabHaobanStaff haobanStaff = staffMapper.selectByPrimaryKeyNoStatus(item.getStaffId());
                 if (null != haobanStaff) {
                     item.setStaffName(haobanStaff.getStaffName());
                     item.setWxUserId(haobanStaff.getWxUserId());