From 6fb14149d62199cfcc0448c82eb2f51f9c5181de Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 31 Dec 2020 16:55:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into parter
---
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java | 71 ++++++++++++++++++++++-------------
1 files changed, 44 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 ecff84f..c51622b 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,25 @@
package com.kidgrow.common.model;
-import com.kidgrow.common.model.SuperModel;
-import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
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)
@@ -27,24 +27,41 @@
@AllArgsConstructor
@TableName("sys_user_org")
public class SysUserOrg extends SuperModel {
- private static final long serialVersionUID=1L;
+// 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;
+ /**
+ * 医院/科室表里面的id
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @NotNull(message = "医院/科室表里面的id")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private Long fromId;
+ /**
+ * 组织级别 0集团 1医院公司 2科室部门
+ */
+ private Integer fromLevel;
+ /**
+ * 数据权限code
+ */
+ private String createUserOrgCode;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ private Boolean isDel;
+}
--
Gitblit v1.8.0