|
|
@@ -503,7 +503,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
FsUser fsUser = fsUserMapper.selectFsUserByUserId(param.getUserId());
|
|
|
//用户不存在唤起重新授权
|
|
|
if (fsUser==null){
|
|
|
- return R.error(504,"未授权");
|
|
|
+ return R.error(401,"未授权");
|
|
|
}
|
|
|
|
|
|
if (fsUser.getStatus()==0){
|
|
|
@@ -546,10 +546,10 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
|
|
|
|
|
|
|
|
|
- //服务号授权的,缺mpOpenId的重新登录 linkType = 4为app看课 不需要mp
|
|
|
- if (param.getLinkType() != 4 && config.getMiniAppAuthType()==2 && StringUtil.strIsNullOrEmpty(fsUser.getMpOpenId())){
|
|
|
- return R.error(401,"授权后可继续!");
|
|
|
- }
|
|
|
+// //服务号授权的,缺mpOpenId的重新登录 linkType = 4为app看课 不需要mp
|
|
|
+// if (param.getLinkType() != 4 && config.getMiniAppAuthType()==2 && StringUtil.strIsNullOrEmpty(fsUser.getMpOpenId())){
|
|
|
+// return R.error(401,"授权后可继续!");
|
|
|
+// }
|
|
|
|
|
|
boolean oneCompanyCourse = config.isOneCompanyCourse();
|
|
|
if(oneCompanyCourse && fsUser.getQwExtId() != null){
|
|
|
@@ -974,7 +974,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
qwAddContactWayParam.setType(1);
|
|
|
qwAddContactWayParam.setScene(2);
|
|
|
qwAddContactWayParam.setUser(users);
|
|
|
- qwAddContactWayParam.setSkip_verify(true);
|
|
|
+ qwAddContactWayParam.setSkip_verify(false);
|
|
|
QwAddContactWayResult qwAddContactWayResult = qwApiService.addContactWay(qwAddContactWayParam, qwUser.getCorpId());
|
|
|
if (qwAddContactWayResult.getErrcode() == 0) {
|
|
|
qwUser.setContactWay(qwAddContactWayResult.getQr_code());
|