From 079267b71fd2d69f75dd9f7434028890006c7088 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 16 Jul 2021 10:54:06 +0800
Subject: [PATCH] commit3

---
 .../java/com/epmet/dto/form/AddSpecialSubjectFormDTO.java    | 3 +++
 .../src/main/java/com/epmet/entity/SpecialSubjectEntity.java | 5 +++++
 .../com/epmet/service/impl/SpecialSubjectServiceImpl.java    | 1 +
 .../resources/db/migration/V0.0.4__create_specialsubject.sql | 2 ++
 4 files changed, 11 insertions(+)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddSpecialSubjectFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddSpecialSubjectFormDTO.java
index dc92be3d6f..46d3e38926 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddSpecialSubjectFormDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddSpecialSubjectFormDTO.java
@@ -23,6 +23,9 @@ public class AddSpecialSubjectFormDTO implements Serializable {
      */
     @NotBlank(message = "orgId不能为空", groups = AddUserInternalGroup.class)
     private String orgId;
+
+    @NotBlank(message = "pid不能为空", groups = AddUserInternalGroup.class)
+    private String pid;
     /**
      * orgId的所有上级id
      */
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java
index a97fe0df12..6f0f61ed9a 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java
@@ -55,6 +55,11 @@ public class SpecialSubjectEntity extends BaseEpmetEntity {
      */
 	private String addOrgId;
 
+	/**
+	 * ADD_ORG_ID的上级id
+	 */
+	private String addOrgPid;
+
 	/**
 	 * 用户所在的组织或者网格的所有上级
 	 */
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java
index de50bc1b51..d335da087b 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java
@@ -157,6 +157,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
             insertEntity.setAddUserAgencyId(result.getData().getAgencyId());
         }
         insertEntity.setAddOrgId(formDTO.getOrgId());
+        insertEntity.setAddOrgPid(formDTO.getPid());
         insertEntity.setAddOrgPids(formDTO.getPids());
         baseDao.insert(insertEntity);
         return new AddSpecialSubjectResultDTO(insertEntity.getId());
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.4__create_specialsubject.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.4__create_specialsubject.sql
index 388674a0dc..87004cd042 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.4__create_specialsubject.sql
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.4__create_specialsubject.sql
@@ -4,6 +4,8 @@ CREATE TABLE `special_subject` (
   `TAG_ID` varchar(64) NOT NULL COMMENT '标签id',
   `ADD_USER_ID` varchar(64) NOT NULL COMMENT '新增此专题的用户id',
   `ADD_ORG_ID` varchar(64) NOT NULL COMMENT '新增此专题时用户所在的组织id或者网格id',
+  `ADD_ORG_PID` varchar(64) NOT NULL COMMENT 'ADD_ORG_ID的上级id',
+  `ADD_ORG_PIDS` varchar(255) NOT NULL COMMENT '用户所在的组织或者网格的所有上级',
   `ORG_LEVEL` varchar(10) NOT NULL COMMENT '网格：grid；社区级：community，\r\n乡（镇、街道）级:street,\r\n区县级: district,\r\n市级: city\r\n省级:province',
   `ADD_USER_AGENCY_ID` varchar(64) NOT NULL COMMENT '新增此专题用户所属的组织id',
   `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',