|
@@ -65,6 +65,7 @@ public class WxCompanyUserController extends AppBaseController {
|
|
|
@ApiOperation("小程序-授权登录")
|
|
|
@PostMapping("/loginByMa")
|
|
|
public R login(@RequestBody LoginMaWxParam param) {
|
|
|
+ log.info("=====================进入小程序授权登录, 入参: {}", param);
|
|
|
if (StringUtils.isBlank(param.getCode())) {
|
|
|
return R.error("code不存在");
|
|
|
}
|
|
@@ -155,6 +156,10 @@ public class WxCompanyUserController extends AppBaseController {
|
|
|
userMap.setNickname(userInfo.getNickName() != null ? userInfo.getNickName() : "微信用户");
|
|
|
userMap.setAvatar(userInfo.getAvatarUrl() != null ? userInfo.getAvatarUrl() : null);
|
|
|
userMap.setPhone(phoneNoInfo.getPhoneNumber());
|
|
|
+ if(companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
|
|
|
+ user.setCompanyId(param.getCompanyId());
|
|
|
+ user.setCompanyUserId(param.getCompanyUserId());
|
|
|
+ }
|
|
|
userService.updateFsUser(userMap);
|
|
|
} else {
|
|
|
//新增
|