Merge remote-tracking branch 'origin/feature-migration-20230628' into feature-migration-20230628

src/main/java/cn/quantgroup/xyqb/controller/internal/user/InnerController.java

@@ -141,6 +141,10 @@ public class InnerController implements IBaseController {
      */
     @RequestMapping("/user/search/uuid")
     public JsonResult findByUuidInfo(String uuid, Integer tenantId) {
+        if (tenantId == null) {
+            tenantId = getTenantId();
+        }
+
         User user = userService.findByUuidWithCache(uuid,tenantId);
         if (user == null) {
             return JsonResult.buildErrorStateResult("查无此人", null);
@@ -200,6 +204,9 @@ public class InnerController implements IBaseController {
     @RequestMapping("/user/getPhoneByUserIds")
     public JsonResult findByIds(@RequestParam(value = "userIds") String userIdsString,
                                 @RequestParam(required = false) Integer tenantId) {
+        if (tenantId == null) {
+            tenantId = getTenantId();
+        }
         if (StringUtils.isEmpty(userIdsString)) {
             return JsonResult.buildErrorStateResult(null, null);
         }
@@ -223,6 +230,9 @@ public class InnerController implements IBaseController {
     @RequestMapping("/user/save")
     public JsonResult saveUser(String phoneNo, Long registeredFrom, Integer tenantId,@RequestHeader(value =Constants.X_AUTH_TENANT,defaultValue = UserConstant.defaultTenantIdString) Integer tenantIdHeader) {
         log.info("保存用户,phoneNo:{},registeredFrom:{}", phoneNo, registeredFrom);
+        if (tenantId == null) {
+            tenantId = getTenantId();
+        }
         //参数验证
         if (StringUtils.isBlank(phoneNo)) {
             return JsonResult.buildErrorStateResult("用户手机号不能为空.", null);
@@ -329,9 +339,9 @@ public class InnerController implements IBaseController {
      */
     @AccessForbiddenValidator
     @RequestMapping("/user_detail/search/userId")
-    public JsonResult findUserDetailByUserId(Long userId, Integer tenantId,@RequestHeader(value =Constants.X_AUTH_TENANT,defaultValue = UserConstant.defaultTenantIdString) Integer tenantIdHeader) {
+    public JsonResult findUserDetailByUserId(Long userId, Integer tenantId) {
         if (tenantId == null) {
-            tenantId = tenantIdHeader;
+            tenantId = getTenantId();
         }
         UserInfoEntity userDetail = null;
         // 增加容错性，防备DB中存在的脏数据触发异常

src/main/java/cn/quantgroup/xyqb/exception/BizExceptionEnum.java

@@ -9,7 +9,7 @@ import lombok.Getter;
 public enum BizExceptionEnum {
     // 登录相关10开通
     UN_EXIT_TENANT_ID("1001","租户id不存在"),
-    UN_EXIT_REGISTERED_FROM("1001","租户id不存在"),
+    UN_EXIT_REGISTERED_FROM("1001","注册来源不存在"),
     UN_AUTHORIZED("1002","请先登录"),
     UN_EXIT_USER("1003","用户不存在"),
     ERROR_PASSWORD("1004","用户名或者密码错误"),