From 87faef26be7883598a45257a01ea4dc8850fea70 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 18 Dec 2020 09:59:43 +0800
Subject: [PATCH] =?UTF-8?q?getAgencyAreaInfo=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99level,=E6=B7=BB=E5=8A=A0agencyId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/dto/result/CompartmentResultDTO.java                | 3 +++
 .../main/resources/mapper/screen/ScreenCustomerAgencyDao.xml   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java
index c7c219d57a..9e941152e4 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.evaluationindex.screen.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -30,6 +31,8 @@ public class CompartmentResultDTO implements Serializable {
      */
     private String areaMarks = "";
 
+    @JsonIgnore
+    private String level;
     /**
      * 当前组织的级别
      * 机关级别
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index f61667fb1c..e6aa6f262a 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -44,6 +44,7 @@
             agency_id AS agencyId,
             agency_name AS name,
             area_marks AS areaMarks,
+            level as level,
             level as agencyLevel
         FROM
             screen_customer_agency