From c241d057a5a2c152b70fcadff8884907a826af6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E7=BB=A7=E5=AD=98?= <449427055@qq.com>
Date: Fri, 19 May 2023 14:06:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E4=BF=9D=E5=AD=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xboe/module/boecase/api/CasesApi.java     |  4 ++--
 .../java/com/xboe/module/boecase/entity/Cases.java     | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java
index fccf5e31..53eee909 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java
@@ -332,7 +332,7 @@ public class CasesApi extends ApiBaseController {
         if(StringUtil.isBlank(cases.getTitle())){
             return badRequest("标题不能为空");
         }
-        if(StringUtil.isBlank(cases.getOrgDomainParent())){
+        if(StringUtil.isBlank(cases.getOrgDomainParent()) && StringUtil.isBlank(cases.getOrgDomainParent2()) && StringUtil.isBlank(cases.getOrgDomainParent3())){
             return badRequest("请选择组织领域");
         }
         if(cases.getMajorIds().isEmpty()){
@@ -364,7 +364,7 @@ public class CasesApi extends ApiBaseController {
         if(StringUtil.isBlank(cases.getTitle())){
             return badRequest("标题不能为空");
         }
-        if(StringUtil.isBlank(cases.getOrgDomainParent())){
+        if(StringUtil.isBlank(cases.getOrgDomainParent()) && StringUtil.isBlank(cases.getOrgDomainParent2()) && StringUtil.isBlank(cases.getOrgDomainParent3())){
             return badRequest("请选择组织领域");
         }
         if(cases.getMajorIds().isEmpty()){
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java
index 2b2ed8d7..38302726 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java
@@ -105,10 +105,18 @@ public class Cases extends BaseEntity {
     @Column(name = "org_domain")
     private String orgDomain;
 
-    /**组织领域一级 对应原数据 二级对应的关系上级的名称*/
+    /**组织领域一级 对应字典code*/
     @Column(name = "org_domain_parent")
     private String orgDomainParent;
 
+    /**组织领域二级 对应字典code*/
+    @Column(name = "org_domain_parent2")
+    private String orgDomainParent2;
+
+    /**组织领域三级级 对应字典code*/
+    @Column(name = "org_domain_parent3")
+    private String orgDomainParent3;
+
     /**专业分类,原数据 案例专业序列caseSpecialtySequence*/
     @Column(name = "major_type")
     private String majorType;