按需求调整销售小程序授权登录

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

@@ -69,14 +69,14 @@ public class WxCompanyUserController extends AppBaseController {
             CompanyUser companyUser = companyUserService.getCompanyUserByOpenId(session.getOpenid());
             String ip = IpUtil.getRequestIp();
 
-            // 如果公司id为空（表示可能是该公司的第一位销售管理员），则需要根据电话号码判断是否存在销售，如果不存在则提示
-            CompanyUser checkPhone = companyUserService.getCompanyUserByPhone(phoneNoInfo.getPhoneNumber());
-            if (param.getCompanyId() == null) {
-                if (checkPhone == null) {
-                    throw new CustomException("由于不是管理员，不能直接登录", 401);
-                }
-            }
+//            // 如果公司id为空（表示可能是该公司的第一位销售管理员），则需要根据电话号码判断是否存在销售，如果不存在则提示
+//            if (param.getCompanyId() == null) {
+//                if (checkPhone == null) {
+//                    throw new CustomException("由于不是管理员，不能直接登录", 401);
+//                }
+//            }
             if (companyUser == null) {
+                CompanyUser checkPhone = companyUserService.getCompanyUserByPhone(phoneNoInfo.getPhoneNumber());
                 if (checkPhone != null) {
                     if (checkPhone.getMaOpenId() == null) {
                         companyUser = checkPhone;
@@ -92,10 +92,12 @@ public class WxCompanyUserController extends AppBaseController {
                     //新增
                     companyUser = new CompanyUser();
                     companyUser.setUserName(phoneNoInfo.getPhoneNumber());
-                    companyUser.setNickName(userInfo.getNickName());
+                    companyUser.setNickName(userInfo.getNickName() == null ? "微信用户" : userInfo.getNickName());
                     companyUser.setPhonenumber(phoneNoInfo.getPhoneNumber());
-                    companyUser.setSex(userInfo != null ? userInfo.getGender() : "0");
-                    companyUser.setPassword(SecurityUtils.encryptPassword(companyUser.getPassword()));
+                    companyUser.setSex(userInfo.getGender());
+                    //密码初始化为123456
+                    String pw = "123456";
+                    companyUser.setPassword(SecurityUtils.encryptPassword(param.getPassword() == null ? pw : param.getPassword()));
                     companyUser.setCreateTime(new Date());
                     companyUser.setCompanyId(param.getCompanyId());
                     companyUser.setParentId(param.getParentCompanyUseId());

fs-company-app/src/main/java/com/fs/app/param/LoginMaWxParam.java

@@ -28,4 +28,7 @@ public class LoginMaWxParam implements Serializable {
     @ApiModelProperty(value = "上级销售id，如果没有则不传")
     private Long parentCompanyUseId;
 
+    @ApiModelProperty(value = "用户密码")
+    private String password;
+
 }