From de2f7fe7f23ac338b7d6997a74b3715e9b1a7cc7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 16 十一月 2023 10:56:18 +0800
Subject: [PATCH] 1、行政区保存功能,修改自动加上行政区级别,及删除标志 2、单点登录中增加了获得所有组织机构的功能,及增加组织机构枚举类型 3、增加农户实体、农户类型实体、分水口实体等相关功能

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java
index d60f91e..742e247 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java
@@ -4,34 +4,56 @@
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dy.common.mybatis.envm.Deleted;
 import com.dy.common.po.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.*;
+import org.hibernate.validator.constraints.Length;
 
-@TableName(autoResultMap = true)
+import java.util.List;
+
+/**
+ * 瑙掕壊瀹炰綋
+ */
+@TableName(value="ba_role", autoResultMap = true)
 @Data
 @Builder
 @ToString
 @NoArgsConstructor
 @AllArgsConstructor
+@Schema(name = "瑙掕壊瀹炰綋")
 public class BaRole implements BaseEntity {
 
     public static final long serialVersionUID = 202310211546001L;
 
     @JSONField(serializeUsing= ObjectWriterImplToString.class)
     @TableId(type = IdType.INPUT)
+    @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     public Long id ;
 
     /**
      * 瑙掕壊鍚嶇О
      */
+    @Schema(description = "鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "鍚嶇О涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    @Length(message = "鍚嶇О涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 2, max = 25)
     public String name ;
 
     /**
      * 鏄惁鍒犻櫎: 0琛ㄧず鏈垹闄�  1琛ㄧず鍒犻櫎.
      */
+    @Schema(description = "鍒犻櫎鏍囪瘑锛岃〃鍗曚笉鐢ㄥ~鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     public Deleted deleted;
 
+
+    /**
+     * 瑙掕壊鎵�鎷ユ湁鐨勬潈闄�
+     */
+    @TableField(exist = false)
+    public List<BaPrivilege> priviList ;
+
 }
\ No newline at end of file

--
Gitblit v1.8.0