1, 手机号登录接口回传对应员工id

2，员工记录保存，主库企业员工关系表id设置为对应员工id

xueyi-auth/src/main/java/com/xueyi/auth/controller/TokenController.java

@@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -66,14 +67,15 @@ public class TokenController {
     @Autowired
     private RedisService redisService;
 
-    @Autowired
-    private RemoteTenantService tenantService;
 
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
 
+    @Autowired
+    private RemoteTenantService tenantService;
+
 
-    private final static String REDIS_LOGIN_CODE_PIX = "saas:login:code:";
+    private static final  String REDIS_LOGIN_CODE_PIX = "saas:login:code:";
 
     @PostMapping("login")
     public AjaxResult login(@RequestBody LoginBody form) {
@@ -85,21 +87,20 @@ public class TokenController {
 
     @PostMapping("phoneLogin")
     public AjaxResult loginByPhone(@Valid @RequestBody PhoneLoginBody form) {
-        /*if (!RedisUtil.existed(REDIS_LOGIN_CODE_PIX + form.getPhone())) {
-            return AjaxResult.error("手机号输入错误或验证码已过期");
-        } else {
-            Integer code = (Integer) RedisUtil.getVal(REDIS_LOGIN_CODE_PIX + form.getPhone());
-            if (null != code && !form.getCode().equals(code.toString())) {
-                return AjaxResult.error("验证码输入不正确");
-            }
-        }*/
+        R<SysEnterpriseStaff> staffR = tenantService.queryStaff(form.getPhone(), SecurityConstants.INNER);
+        if (staffR.isFail() || staffR.getData() == null) {
+            return AjaxResult.error("手机号不正确，清查验");
+        }
+
         // 用户手机号验证登录
         LoginUser userInfo = sysLoginService.loginByPhone(form.getPhone());
         if (null == userInfo) {
             return AjaxResult.error("手机号不正确，清查验");
         }
         // 获取登录token
-        return AjaxResult.success(tokenService.createToken(userInfo));
+        Map<String, Object> map = tokenService.createToken(userInfo);
+        map.put("staffId", staffR.getData().getId());//塞入对应staffId
+        return AjaxResult.success(map);
     }
 
     @DeleteMapping("logout")

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/DmStaffController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.xueyi.common.cache.utils.SourceUtil;
 import com.xueyi.common.core.constant.basic.SecurityConstants;
 import com.xueyi.common.core.context.SecurityContextHolder;
+import com.xueyi.common.core.utils.core.IdUtil;
 import com.xueyi.common.core.utils.core.ObjectUtil;
 import com.xueyi.common.core.utils.core.StrUtil;
 import com.xueyi.common.core.utils.file.FileTypeUtil;
@@ -144,11 +145,13 @@ public class DmStaffController extends BaseController<DmStaffQuery, DmStaffDto,
                 dmStaff.setAvatar(dto.getUrl());
             }
         }
+        long id = IdUtil.getSnowflakeNextId();
+        dmStaff.setId(id);
         //以下代码添加主库企业和员工的关系映射表，用于手机号登录以及小程序登录
         SysEnterpriseStaff enterpriseStaff = new SysEnterpriseStaff();
         enterpriseStaff.setPhone(dmStaff.getPhone());
-        enterpriseStaff.setStaffId(dmStaff.getId());
-        enterpriseStaff.setId(dmStaff.getId());
+        enterpriseStaff.setStaffId(id);
+        enterpriseStaff.setId(id);
         enterpriseStaff.setTId(SecurityContextHolder.getEnterpriseId());
         tenantService.saveEnterpriseStaff(enterpriseStaff, SecurityConstants.INNER);
         AjaxResult result = super.add(dmStaff);