所有表加入租户字段tenant_id;

Dao切面/BaseEntity加入tenantId属性;
C端用户注册/登录加入tenantId;

ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/domain/SysUser.java

@@ -34,7 +34,9 @@ public class SysUser extends BaseEntity
     @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
 
-    /** 用户账号 */
+    /**
+     * 用户账号
+     */
     @Excel(name = "登录名称")
     private String userName;
 
@@ -43,15 +45,26 @@ public class SysUser extends BaseEntity
      */
     private String userType;
 
-    /** 用户昵称 */
+    /**
+     * 租户id（000000平台）
+     */
+    private String tenantId;
+
+    /**
+     * 用户昵称
+     */
     @Excel(name = "用户名称")
     private String nickName;
 
-    /** 用户邮箱 */
+    /**
+     * 用户邮箱
+     */
     @Excel(name = "用户邮箱")
     private String email;
 
-    /** 手机号码 */
+    /**
+     * 手机号码
+     */
     @Excel(name = "手机号码")
     private String phonenumber;
 
@@ -353,22 +366,37 @@ public class SysUser extends BaseEntity
     }
 
     public void setDataPowerType(Integer dataPowerType) {
+
         this.dataPowerType = dataPowerType;
     }
 
     public String getUserType() {
+
         return userType;
     }
 
     public void setUserType(String userType) {
+
         this.userType = userType;
     }
 
+    public String getTenantId() {
+
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+
+        this.tenantId = tenantId;
+    }
+
     public Long getInternetUserId() {
+
         return internetUserId;
     }
 
     public void setInternetUserId(Long internetUserId) {
+
         this.internetUserId = internetUserId;
     }
 
@@ -408,6 +436,7 @@ public class SysUser extends BaseEntity
                 .append("updateTime", getUpdateTime())
                 .append("remark", getRemark())
                 .append("dept", getDept())
+                .append("tenantId", getTenantId())
             .toString();
     }
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/model/LoginUser.java

@@ -1,10 +1,10 @@
 package com.xhpc.system.api.model;
 
+import com.xhpc.system.api.domain.SysUser;
+
 import java.io.Serializable;
 import java.util.Set;
 
-import com.xhpc.system.api.domain.SysUser;
-
 /**
  * 用户信息
  *
@@ -34,6 +34,11 @@ public class LoginUser implements Serializable
      */
     private Integer userType;
 
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
     /**
      * 登录用户的openID
      */
@@ -156,22 +161,39 @@ public class LoginUser implements Serializable
 
     public void setSysUser(SysUser sysUser)
     {
+
         this.sysUser = sysUser;
     }
 
     public Integer getUserType() {
+
         return userType;
     }
 
     public void setUserType(Integer userType) {
+
         this.userType = userType;
     }
 
+    public String getTenantId() {
+
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+
+        this.tenantId = tenantId;
+    }
+
     public String getOpenId() {
+
         return openId;
     }
 
     public void setOpenId(String openId) {
+
         this.openId = openId;
     }
+
+
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/web/domain/BaseEntity.java

@@ -34,20 +34,31 @@ public class BaseEntity implements Serializable
     /** 更新者 */
     private String updateBy;
 
-    /** 更新时间 */
+    /**
+     * 更新时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     private String remark;
 
-    /** 请求参数 */
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
+    /**
+     * 请求参数
+     */
     @Transient
     private Map<String, Object> params;
 
-    public String getSearchValue()
+    public String getSearchValue() {
-    {
+
         return searchValue;
     }
 
@@ -91,25 +102,34 @@ public class BaseEntity implements Serializable
         return updateTime;
     }
 
-    public void setUpdateTime(Date updateTime)
+    public void setUpdateTime(Date updateTime) {
-    {
+
         this.updateTime = updateTime;
     }
 
-    public String getRemark()
+    public String getRemark() {
-    {
+
         return remark;
     }
 
-    public void setRemark(String remark)
+    public void setRemark(String remark) {
-    {
+
         this.remark = remark;
     }
 
-    public Map<String, Object> getParams()
+    public String getTenantId() {
-    {
+
-        if (params == null)
+        return tenantId;
-        {
+    }
+
+    public void setTenantId(String tenantId) {
+
+        this.tenantId = tenantId;
+    }
+
+    public Map<String, Object> getParams() {
+
+        if (params == null) {
             params = new HashMap<>();
         }
         return params;

ruoyi-common/ruoyi-common-security/src/main/java/com/xhpc/common/security/service/TokenService.java

@@ -43,6 +43,7 @@ public class TokenService {
         loginUser.setUserid(loginUser.getSysUser().getUserId());
         loginUser.setUsername(loginUser.getSysUser().getUserName());
         loginUser.setIpaddr(IpUtils.getIpAddr(ServletUtils.getRequest()));
+        loginUser.setTenantId(loginUser.getTenantId());
         refreshToken(loginUser);
 
         // 保存或更新用户token

ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java

@@ -15,7 +15,6 @@ import com.xhpc.system.api.domain.SysRole;
 import com.xhpc.system.api.domain.SysUser;
 import com.xhpc.system.api.model.LoginUser;
 import com.xhpc.system.service.*;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -24,7 +23,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -106,6 +104,7 @@ public class SysUserController extends BaseController {
         Set<String> permissions = permissionService.getMenuPermission(sysUser.getUserId());
         LoginUser sysUserVo = new LoginUser();
         sysUserVo.setSysUser(sysUser);
+        sysUserVo.setTenantId(sysUser.getTenantId());
         sysUserVo.setRoles(roles);
         sysUserVo.setPermissions(permissions);
         return R.ok(sysUserVo);

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -51,9 +51,38 @@
     </resultMap>
 
     <sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+        select u.user_id,
-        d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,u.data_power_type ,
+               u.dept_id,
-        r.role_id, r.role_name, r.role_key , r.role_sort, r.data_scope, r.status as role_status,u.user_type,u.operator_id
+               u.user_name,
+               u.nick_name,
+               u.email,
+               u.avatar,
+               u.phonenumber,
+               u.password,
+               u.sex,
+               u.status,
+               u.del_flag,
+               u.login_ip,
+               u.login_date,
+               u.create_by,
+               u.create_time,
+               u.remark,
+               d.dept_id,
+               d.parent_id,
+               d.dept_name,
+               d.order_num,
+               d.leader,
+               d.status as dept_status,
+               u.data_power_type,
+               r.role_id,
+               r.role_name,
+               r.role_key,
+               r.role_sort,
+               r.data_scope,
+               r.status as role_status,
+               u.user_type,
+               u.tenant_id,
+               u.operator_id
         from sys_user u
                  left join sys_dept d on u.dept_id = d.dept_id
                  left join sys_user_role ur on u.user_id = ur.user_id
@@ -62,7 +91,8 @@
 
     <select id="selectUserList" parameterType="com.xhpc.system.api.domain.SysUser" resultMap="SysUserResult">
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
-        u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from
+        u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,
+        u.tenant_id from
         sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         where u.del_flag = '0'

sql/v2.1.sql

@@ -84,7 +84,6 @@ CREATE TABLE `xhpc_user_login` (
 
 CREATE TABLE `xhpc_tenant`
 (
-    `id`                 BIGINT(20)    NOT NULL COMMENT '主键',
     `tenant_id`          VARCHAR(12)   NULL DEFAULT '000000' COMMENT '租户ID',
     `tenant_name`        VARCHAR(50)   NOT NULL COMMENT '租户名称',
     `domain`             VARCHAR(255)  NULL DEFAULT NULL COMMENT '域名地址',
@@ -102,9 +101,180 @@ CREATE TABLE `xhpc_tenant`
     `update_time`        DATETIME      NULL DEFAULT NULL COMMENT '修改时间',
     `status`             INT(2)        NULL DEFAULT NULL COMMENT '状态',
     `is_deleted`         INT(2)        NULL DEFAULT '0' COMMENT '是否已删除',
-    PRIMARY KEY (`id`) USING BTREE
+    PRIMARY KEY (`tenant_id`) USING BTREE
 )
     COMMENT ='租户表'
     COLLATE = 'utf8mb4_general_ci'
     ENGINE = InnoDB
 ;
+
+ALTER TABLE `et_auth_sec_token`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `et_charge_order_info`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `et_common_operator_info`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `et_common_station_info`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `et_connector_status_info`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `et_dispute_orders`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `et_equip_charge_status_info`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `et_order_mapping`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `gen_table`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `gen_table_column`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `hibernate_sequence`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `oder_test`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `service_field`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_config`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_dept`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_dict_data`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_dict_type`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_job`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_job_log`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_logininfor`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_menu`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_notice`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_oper_log`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_post`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_role`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_role_dept`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_role_menu`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_user`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_user_post`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `sys_user_role`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_agreement`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_app_user`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_area`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_charge_order`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_charge_order_current`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_charge_order_soc`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_charge_order_status`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_charge_order_voltage`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_charging_pile`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_charging_station`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_charging_station_push_status`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_community`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_community_personnel`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_customers`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_customers_personnel`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_data_dimension`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_device_message`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_dict_biz`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_help`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_history_order`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_history_order_reconciliation_status`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_history_order_sorting_status`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_img`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_internet_user`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_invoice`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_invoice_map_history_order`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_mechanism`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_message`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_notice_read`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_operator`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_operator_internet_blacklist`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_order_redis_record`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_promotion`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_promotion_coupon`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_promotion_platform`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_promotion_station`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_rate`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_rate_model`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_rate_time`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_real_time_order`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_recharge_order`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_refund_audit`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_refund_order`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_sms`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_station_internet_blacklist`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_statistics_station`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_statistics_time_interval`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_terminal`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_tradebill_internet_check_record`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_tradebill_payment_check_record`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_tradebill_upload_record`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_user_account_statement`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_user_login`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_user_privilege`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';
+ALTER TABLE `xhpc_vin_blacklist`
+    ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id';

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/aspect/UserDaoAspect.java

@@ -30,6 +30,7 @@ public class UserDaoAspect {
     private static final String CREATE_TIME = "createTime";
     private static final String UPDATE_BY = "updateBy";
     private static final String UPDATE_TIME = "updateTime";
+    private static final String TENANT_ID = "tenantId";
 
     @Pointcut("execution(* com.xhpc..*.update*(..))")
     public void daoUpdate() {
@@ -118,6 +119,10 @@ public class UserDaoAspect {
                     if (isProperty(arg, UPDATE_TIME) && StringUtils.isEmpty(BeanUtils.getProperty(arg, UPDATE_TIME))) {
                         BeanUtils.setProperty(arg, UPDATE_TIME, date);
                     }
+
+                    if (isProperty(arg, TENANT_ID) && StringUtils.isEmpty(BeanUtils.getProperty(arg, TENANT_ID))) {
+                        BeanUtils.setProperty(arg, TENANT_ID, date);
+                    }
                 }
             }
         } catch (Exception e) {

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java

@@ -129,6 +129,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService {
         String phone = StringUtils.valueOf(map.get("phone"));
         String type = StringUtils.valueOf(map.get("type"));
         String openid = StringUtils.valueOf(map.get("openid"));
+        String tenantId = StringUtils.valueOf(map.get("tenantId"));
         if (StringUtils.isEmpty(openid)) {
             return R.fail(HttpStatus.NOT_NULL, "openid不能为空");
         }
@@ -167,7 +168,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService {
         xhpcAppUser.setCreateTime(new Date());
         xhpcAppUserMapper.insert(xhpcAppUser);
         redisService.deleteObject("pvToken:"+phone);
-        return appLogin(phone, type, openid);
+        return appLogin(phone, type, openid, tenantId);
     }
 
     /**
@@ -181,11 +182,12 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService {
         String code = StringUtils.valueOf(map.get("code"));
         String phone = StringUtils.valueOf(map.get("phone"));
         String type = StringUtils.valueOf(map.get("type"));
+        String tenantId = StringUtils.valueOf(map.get("tenantId"));
         if("18123374652".equals(phone) && "123456".equals(code)){
             if("1".equals(type)){
-                return appLogin(phone, "1", "ot6ul4nlSC5ZZOC4rTLS5hedFTGk");
+                return appLogin(phone, "1", "ot6ul4nlSC5ZZOC4rTLS5hedFTGk", tenantId);
             }
-            return appLogin(phone, "2", "2088912814256712");
+            return appLogin(phone, "2", "2088912814256712", tenantId);
         }
         if (StringUtils.isEmpty(code)) {
             return R.fail(HttpStatus.NOT_NULL, "验证码不能为空");
@@ -198,14 +200,14 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService {
         if (!code.equalsIgnoreCase(captcha)) {
             return R.fail(HttpStatus.ERROR_STATUS, "验证码错误");
         }
-        return appLogin(phone, type, openid);
+        return appLogin(phone, type, openid, tenantId);
     }
 
     /**
      * 登录
      */
     @Transactional
-    public R<?> appLogin(String username, String type, String openid) {
+    public R<?> appLogin(String username, String type, String openid, String tenantId) {
         // 用户名或密码为空 错误
         if (StringUtils.isAnyBlank(username)) {
             return R.fail(HttpStatus.NOT_NULL, "用户必须填写");
@@ -274,6 +276,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService {
                 xhpcAppUser.setAlipayOpenId(openid);
                 xhpcAppUser.setAlipayLogin(1);
             }
+            xhpcAppUser.setTenantId(tenantId);
             xhpcAppUserMapper.insert(xhpcAppUser);
             user = xhpcAppUserMapper.getAppUserByPhone(username);
             // 获取登录token
@@ -289,6 +292,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService {
         userInfo.setUsername(username);
         userInfo.setOpenId(openid);
         userInfo.setUserid(user.getAppUserId());
+        userInfo.setTenantId(tenantId);
         if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
             return R.fail(HttpStatus.DATA_ERROR, "对不起，您的账号：" + username + " 已被删除");
         }
@@ -378,6 +382,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService {
     public R<?> voluntaryLogin(Map<String, Object> map) {
         String type = StringUtils.valueOf(map.get("type"));
         String openid = StringUtils.valueOf(map.get("openid"));
+        String tenantId = StringUtils.valueOf(map.get("tenantId"));
         Map<String, Object> userLoginTime = xhpcAppUserMapper.getUserLoginTime(Integer.valueOf(type), openid);
         if(userLoginTime ==null){
             return R.fail(HttpStatus.USER_LOGIN, "请重新登录");
@@ -385,7 +390,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService {
         if(UserConstants.NO_LOGIN.equals(userLoginTime.get("status").toString())){
             return R.fail(HttpStatus.USER_LOGIN, "请重新登录");
         }
-        return appLogin(userLoginTime.get("account").toString(), type, openid);
+        return appLogin(userLoginTime.get("account").toString(), type, openid, tenantId);
     }
 
     /**