zyp

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -993,7 +993,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
     @Override
     @Transactional
     public ResponseResult<Boolean> isAddCompanyUser(FsUserCourseAddCompanyUserParam param) {
-        logger.info("=======================进入个微-判断是否添加客服===========================，入参：{}",param);
+        logger.info("\n 【进入个微-判断是否添加客服】，入参：{}",param);
         //查询用户
         FsUser fsUser = fsUserMapper.selectFsUserById(param.getUserId());
         if (fsUser == null){

fs-user-app/src/main/java/com/fs/app/controller/WxCompanyUserController.java

@@ -133,11 +133,11 @@ public class WxCompanyUserController extends AppBaseController {
                     if (user.getCompanyUserId() != null && !param.getCompanyUserId().equals(user.getCompanyUserId())){
                         return R.error(406, "该用户已成为其他销售会员");
                     }
-                    if((companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
-                            && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
-                        userMap.setCompanyId(param.getCompanyId());
-                        userMap.setCompanyUserId(param.getCompanyUserId());
-                    }
+//                    if((companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
+//                            && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
+//                        userMap.setCompanyId(param.getCompanyId());
+//                        userMap.setCompanyUserId(param.getCompanyUserId());
+//                    }
                     userService.updateFsUser(userMap);
                 } else {
                     //新增