From ec0f2528f83ee7c6ec64537d561a697ffff5b5c3 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Tue, 21 Apr 2020 15:27:04 +0800
Subject: [PATCH] 1.组织,医院,科室的编辑业务调整,增加了联动编辑功能(创建医院自动创建组织数据,修改同理) 2.重新优化,调整了医院/科室编辑过程中对名称的检查,数据间依赖关系的调整 3.调整优化了区域联动插件,自动完成插件的通用性

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
index 206aa71..1618f27 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
@@ -1,5 +1,6 @@
 package com.kidgrow.usercenter.model;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kidgrow.common.model.SuperModel;
 import lombok.AllArgsConstructor;
@@ -7,6 +8,8 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -33,12 +36,16 @@
     /**
      * 组织Id
      */
-    @NotEmpty(message = "组织Id不能为空")
     private Long orgId;
+    /**
+     * 医院Id
+     */
+    @NotNull(message = "医院Id不能为空")
+    private Long hospitalId;
     /**
      * 负责的销售代表
      */
-    @NotEmpty(message = "负责的销售代表不能为空")
+    @NotNull(message = "负责的销售代表不能为空")
     private Long serverUserId;
     /**
      * 销售代表的名字
@@ -46,15 +53,12 @@
     @NotEmpty(message = "销售代表的名字不能为空")
     private String serverUserName;
     /**
-     * 科室/部门简介
-     */
-    private String departmentAbout;
-    /**
      * 状态,1启用,0停用
      */
     private Boolean enabled;
     /**
      * 是否删除,1删除,0未删除
      */
+    @TableLogic
     private Boolean isDel;
 }

--
Gitblit v1.8.0