Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master'

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java

@@ -30,5 +30,14 @@ public class TagScopeDTO implements Serializable {
      */
     @NotBlank(message = "orgIdPath不能为空",groups = AddUserShowGroup.class)
     private String orgIdPath;
+
+    /**
+     * agencyId的直属上级
+     */
+    private String pid;
+    /**
+     * 社区名称
+     */
+    private String agencyName;
 }
 

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java

@@ -37,5 +37,12 @@ public class TagScopeEntity extends BaseEpmetEntity {
 	 * agency_id全路径，包含自身
 	 */
 	private String orgIdPath;
-
+	/**
+	 * agencyId的直属上级
+	 */
+	private String pid;
+	/**
+	 * 社区名称
+	 */
+	private String agencyName;
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java

@@ -123,6 +123,8 @@ public class TagCustomerServiceImpl extends BaseServiceImpl<TagCustomerDao, TagC
                 tagScopeEntity.setTagId(entity.getId());
                 tagScopeEntity.setAgencyId(tagScopeDTO.getAgencyId());
                 tagScopeEntity.setOrgIdPath(tagScopeDTO.getOrgIdPath());
+                tagScopeEntity.setAgencyName(tagScopeDTO.getAgencyName());
+                tagScopeEntity.setPid(tagScopeDTO.getPid());
                 tagScopeDao.insert(tagScopeEntity);
             });
         }
@@ -156,6 +158,8 @@ public class TagCustomerServiceImpl extends BaseServiceImpl<TagCustomerDao, TagC
                 tagScopeEntity.setTagId(entity.getId());
                 tagScopeEntity.setAgencyId(tagScopeDTO.getAgencyId());
                 tagScopeEntity.setOrgIdPath(tagScopeDTO.getOrgIdPath());
+                tagScopeEntity.setAgencyName(tagScopeDTO.getAgencyName());
+                tagScopeEntity.setPid(tagScopeDTO.getPid());
                 tagScopeDao.insert(tagScopeEntity);
             });
         }

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml

@@ -89,6 +89,7 @@
             ts.CUSTOMER_ID = #{customerId}
           AND tc.CUSTOMER_ID
           AND ts.AGENCY_ID = #{agencyId}
+          and tc.SHOW_FLAG ='1'
         ORDER BY
             convert(tc.TAG_NAME USING gbk) ASC;
     </select>