Merge branch 'feature/xgh/导购任务' into 'master'

非空判断

See merge request !2258

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

@@ -134,7 +134,7 @@ public class OpenStaffApiServiceImpl implements OpenStaffApiService {
             log.info("只能托管一个企业={},{}", uuid, corpName);
             return ServiceResponse.failure("9999", "只能托管一个企业");
         }
-        if(!openStaff.getStaffId().equals(staff.getStaffId())) {
+        if(null != staff && !openStaff.getStaffId().equals(staff.getStaffId())) {
             this.openStaffService.logout(uuid, "userid不能关联2个成员", 0, null);
             log.info("userid不能关联2个成员={},{},{}", openStaff.getStaffId(), staff.getStaffId(),qwUserId);
             return ServiceResponse.failure("9999", "userid不能关联2个成员");