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

参数

See merge request !444

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

@@ -82,7 +82,8 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
     @Override
     public boolean delBind(String oldClerkId, String optStaffId, int channelCode, String newClerkId) {
-        StaffClerkRelationDTO clerkRelation = mapper.getOneByClerkId(oldClerkId, null);
+        TabHaobanStaff staff =  this.staffService.selectById(optStaffId) ;
+        StaffClerkRelationDTO clerkRelation = mapper.getOneByClerkId(oldClerkId, staff.getWxEnterpriseId());
         if (null == clerkRelation) {
             logger.info("老的绑定关联不存在,clerkId={}", oldClerkId);
             return true;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -313,7 +313,7 @@ public class StaffController extends WebBaseController {
     @RequestMapping("del-clerk-relation")
     public HaobanResponse delStaffClerkList(String clerkId) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        boolean b = staffClerkRelationApiService.unbindByStaffAndClerkId(login.getClerkId(), clerkId, ChannelCodeEnum.ADMIN_UNBIND.getCode());
+        boolean b = staffClerkRelationApiService.unbindByStaffAndClerkId(login.getStaffId(), clerkId, ChannelCodeEnum.ADMIN_UNBIND.getCode());
         return resultResponse(HaoBanErrCode.ERR_1, b);
     }