Procházet zdrojové kódy

fix:小程序授权登录-销售id不必传,需添加校验

caoliqin před 2 týdny
rodič
revize
8469c39eb2

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

@@ -140,7 +140,10 @@ public class WxCompanyUserController extends AppBaseController {
             }
 
             // 根据销售后台设置的  是否需要单独注册会员 来判断是否需要设置销售的值
-            CompanyUser companyUser = companyUserService.selectCompanyUserById(param.getCompanyUserId());
+            CompanyUser companyUser = null;
+            if(param.getCompanyUserId() != null){
+                companyUser = companyUserService.selectCompanyUserById(param.getCompanyUserId());
+            }
 
             String ip = IpUtil.getRequestIp();
             if (user == null) {
@@ -156,7 +159,7 @@ 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){
+                    if(companyUser != null && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
                         user.setCompanyId(param.getCompanyId());
                         user.setCompanyUserId(param.getCompanyUserId());
                     }
@@ -171,7 +174,7 @@ public class WxCompanyUserController extends AppBaseController {
                     user.setUnionId(session.getUnionid());
                     user.setCreateTime(new Date());
                     user.setPhone(phoneNoInfo.getPhoneNumber());
-                    if(companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
+                    if(companyUser != null && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
                         user.setCompanyId(param.getCompanyId());
                         user.setCompanyUserId(param.getCompanyUserId());
                     }