From f2ee6178a39c0b713ff6c5d30f13d4a223ae5a94 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 13 May 2020 17:19:37 +0800
Subject: [PATCH] 1.给common.js增加通用功能按钮按权限隐藏函数 2.修改医生模版，公司管理静态页面，支持按权限显示隐藏功能按钮。
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java | 80 +++++++++++++++++++++-------------------
1 files changed, 42 insertions(+), 38 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 b78ca62..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,25 +1,24 @@
package com.kidgrow.usercenter.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.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 科室表<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-02 14:02:50 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,34 +26,39 @@
@AllArgsConstructor
@TableName("sys_department")
public class SysDepartment extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 科室/部门名称 同组织名称
- */
- @NotBlank(message = "科室/部门名称 同组织名称不能为空")
- private String departmentName;
- /**
- * 组织Id
- */
- @NotBlank(message = "组织Id不能为空")
- private Long orgId;
- /**
- * 负责的销售代表
- */
- @NotBlank(message = "负责的销售代表不能为空")
- private Long serverUserId;
- /**
- * 销售代表的名字
- */
- @NotBlank(message = "销售代表的名字不能为空")
- private String serverUserName;
- /**
- * 科室/部门简介
- */
- private String departmentAbout;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- }
+ /**
+ * 科室/部门名称 同组织名称
+ */
+ @NotEmpty(message = "科室/部门名称 同组织名称不能为空")
+ private String departmentName;
+ /**
+ * 组织Id
+ */
+ private Long orgId;
+ /**
+ * 医院Id
+ */
+ @NotNull(message = "医院Id不能为空")
+ private Long hospitalId;
+ /**
+ * 负责的销售代表
+ */
+ @NotNull(message = "负责的销售代表不能为空")
+ private Long serverUserId;
+ /**
+ * 销售代表的名字
+ */
+ @NotEmpty(message = "销售代表的名字不能为空")
+ private String serverUserName;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @TableLogic
+ private Boolean isDel;
+}
--
Gitblit v1.8.0