From 4f69317eb864b24ddb36c8e517344ddf11d22a3e Mon Sep 17 00:00:00 2001 From: 克 刘 <4345453@qq.com> Date: Thu, 18 Jun 2020 16:28:22 +0800 Subject: [PATCH] 加强table.render中验证token,用于控制单个设备登录后跳转login --- kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java | 58 +++++++++++++++++++++++++++++++--------------------------- 1 files changed, 31 insertions(+), 27 deletions(-) diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java index 1cd9232..06aacd2 100644 --- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java +++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java @@ -1,25 +1,23 @@ package com.kidgrow.common.model; -import com.kidgrow.common.model.SuperModel; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.hibernate.validator.constraints.*; -import java.util.Date; + +import javax.validation.constraints.NotNull; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> + * + * @version 1.0 * @Description: 用户和组织关系表<br> * @Project: 用户中心<br> * @CreateDate: Created in 2020-03-31 11:01:35 <br> * @Author: <a href="4345453@kidgrow.com">liuke</a> - * @version 1.0 */ @Data @EqualsAndHashCode(callSuper = false) @@ -29,22 +27,28 @@ public class SysUserOrg extends SuperModel { // private static final long serialVersionUID = -2071565876962058344L; - /** - * 用户id - */ - @NotBlank(message = "用户id不能为空") - private Long userId; - /** - * 组织ID - */ - @NotBlank(message = "组织ID不能为空") - private Long orgId; - /** - * 状态,1启用,0停用 - */ - private Boolean enabled; - /** - * 是否删除,1删除,0未删除 - */ - private Boolean isDel; - } + /** + * 用户id + */ + @JsonSerialize(using = ToStringSerializer.class) + @NotNull(message = "用户id不能为空") + private Long userId; + /** + * 组织ID + */ + @JsonSerialize(using = ToStringSerializer.class) + @NotNull(message = "组织ID不能为空") + private Long orgId; + /** + * 数据权限code + */ + private String createUserOrgCode; + /** + * 状态,1启用,0停用 + */ + private Boolean enabled; + /** + * 是否删除,1删除,0未删除 + */ + private Boolean isDel; +} -- Gitblit v1.8.0