diff --git a/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java b/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java
index 4cf84be..2bb8a27 100755
--- a/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java
+++ b/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java
@@ -319,7 +319,7 @@ public class ReportCaseServiceImpl extends BaseService implements IReportCaseSer
     /**
      * 设置专管员区域参数
      *
-     * @param areaId
+     * @param params
      */
     private void setNPersonAreaParams(Map<String, Object> params) {
         Object areaIdObj = params.get("areaId");
@@ -1150,7 +1150,6 @@ public class ReportCaseServiceImpl extends BaseService implements IReportCaseSer
         if (areaIdObj == null || StringUtils.isBlank(areaIdObj.toString()) ||
                 StringUtils.equals(ISystemCityConsts.N_PERSON_AREA_ID, areaIdObj.toString())) {
             // 列出所有的专管机构
-
             params.put("departmentParentId", "0");
             List<HandleDepartmentDTO> handleDepartmentDTOS = reportCaseDao.listDept(params);
             for (int i = 0; i < handleDepartmentDTOS.size(); i++) {
diff --git a/src/main/resources/mybatis/mapper/grid/grid-mapper.xml b/src/main/resources/mybatis/mapper/grid/grid-mapper.xml
index 2818cb4..f0c4be0 100644
--- a/src/main/resources/mybatis/mapper/grid/grid-mapper.xml
+++ b/src/main/resources/mybatis/mapper/grid/grid-mapper.xml
@@ -298,7 +298,19 @@
                     relation_id = #{excludeRelationId}
             )
         </if>
-        GROUP BY t1.grid_id
+        GROUP BY
+            t1.grid_id,
+            t1.grid_name,
+            t1.grid_summary,
+            t1.grid_group_id,
+            t1.grid_duty,
+            t1.grid_code,
+            t1.grid_square,
+            t1.area_code,
+            t1.area_name,
+            t1.fill_color,
+            t1.gmt_create,
+            t1.gmt_modified
     </select>
 
     <!-- 网格列表（group） -->
diff --git a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml
index 54496de..71eac0e 100755
--- a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml
+++ b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml
@@ -157,16 +157,34 @@
             AND LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
         <!-- 专管员（N员）区域（上报的）案件 -->
+<!--        <if test="isNPersonArea != null and isNPersonArea == 'true'">-->
+<!--        AND-->
+<!--            t1.creator IN (-->
+<!--                SELECT-->
+<!--                    user_id-->
+<!--                FROM-->
+<!--                    sys_role_user-->
+<!--                WHERE-->
+<!--                    &lt;!&ndash; 专管员角色ID &ndash;&gt;-->
+<!--                    role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'-->
+<!--            )-->
+<!--        </if>-->
         <if test="isNPersonArea != null and isNPersonArea == 'true'">
         AND
-            t1.creator IN (
+            t1.report_case_id IN (
                 SELECT
-                    user_id
+                    st1.case_id
                 FROM
-                    sys_role_user
+                    city_report_case_assign st1
                 WHERE
-                    <!-- 专管员角色ID -->
-                    role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'
+                    st1.is_delete = 0
+                AND
+                    st1.handle_user_id IN (
+                        SELECT
+                            sst1.user_id
+                        FROM
+                            sys_department_user sst1
+                )
             )
         </if>
         ORDER BY t1.gmt_modified DESC
@@ -422,17 +440,42 @@
             )
         </if>
         <!-- 专管员（N员）区域（上报的）案件 -->
+<!--        <if test="isNPersonArea != null and isNPersonArea == 'true'">-->
+<!--        AND-->
+<!--            t1.creator IN (-->
+<!--                SELECT-->
+<!--                    user_id-->
+<!--                FROM-->
+<!--                    sys_role_user-->
+<!--                WHERE-->
+<!--                    &lt;!&ndash; 专管员角色ID &ndash;&gt;-->
+<!--                    role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'-->
+<!--            )-->
+<!--        </if>-->
+        <!-- 专管员处理的案件 -->
         <if test="isNPersonArea != null and isNPersonArea == 'true'">
-        AND
-            t1.creator IN (
-                SELECT
-                    user_id
-                FROM
-                    sys_role_user
-                WHERE
-                    <!-- 专管员角色ID -->
-                    role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'
-            )
+            AND
+                t1.report_case_id IN (
+                    SELECT
+                        st1.case_id
+                    FROM
+                        city_report_case_assign st1
+                    WHERE
+                        st1.is_delete = 0
+                    AND
+                        st1.handle_user_id IN (
+                            SELECT
+                                sst1.user_id
+                            FROM
+                                sys_department_user sst1
+                            INNER JOIN
+                                sys_role_user sst2
+                            ON
+                                sst1.user_id = sst2.user_id
+                            AND
+                                sst2.role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'
+                        )
+                )
         </if>
         <if test="handleDepartmentId != null and handleDepartmentId != ''">
         AND
@@ -792,16 +835,41 @@
             </foreach>
         </if>
         <!-- 专管员（N员）区域（上报的）案件 -->
+<!--        <if test="isNPersonArea != null and isNPersonArea == 'true'">-->
+<!--        AND-->
+<!--            t1.creator IN (-->
+<!--                SELECT-->
+<!--                    user_id-->
+<!--                FROM-->
+<!--                    sys_role_user-->
+<!--                WHERE-->
+<!--                    &lt;!&ndash; 专管员角色ID &ndash;&gt;-->
+<!--                    role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'-->
+<!--            )-->
+<!--        </if>-->
+        <!-- 专管员处理的案件 -->
         <if test="isNPersonArea != null and isNPersonArea == 'true'">
-        AND
-            t1.creator IN (
-                SELECT
-                    user_id
-                FROM
-                    sys_role_user
-                WHERE
-                    <!-- 专管员角色ID -->
-                    role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'
+            AND
+                t1.report_case_id IN (
+                    SELECT
+                        st1.case_id
+                    FROM
+                        city_report_case_assign st1
+                    WHERE
+                        st1.is_delete = 0
+                    AND
+                        st1.handle_user_id IN (
+                            SELECT
+                                sst1.user_id
+                            FROM
+                                sys_department_user sst1
+                            INNER JOIN
+                                sys_role_user sst2
+                            ON
+                                sst1.user_id = sst2.user_id
+                            AND
+                                sst2.role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'
+                        )
             )
         </if>
         ORDER BY
@@ -885,16 +953,41 @@
             </foreach>
         </if>
         <!-- 专管员（N员）区域（上报的）案件 -->
+<!--        <if test="isNPersonArea != null and isNPersonArea == 'true'">-->
+<!--        AND-->
+<!--            t1.creator IN (-->
+<!--                SELECT-->
+<!--                    user_id-->
+<!--                FROM-->
+<!--                    sys_role_user-->
+<!--                WHERE-->
+<!--                    &lt;!&ndash; 专管员角色ID &ndash;&gt;-->
+<!--                    role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'-->
+<!--            )-->
+<!--        </if>-->
+        <!-- 专管员处理的案件 -->
         <if test="isNPersonArea != null and isNPersonArea == 'true'">
-        AND
-            t1.creator IN (
+            AND
+            t1.report_case_id IN (
                 SELECT
-                    user_id
+                    st1.case_id
                 FROM
-                    sys_role_user
+                    city_report_case_assign st1
                 WHERE
-                    <!-- 专管员角色ID -->
-                    role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'
+                    st1.is_delete = 0
+                AND
+                    st1.handle_user_id IN (
+                        SELECT
+                            sst1.user_id
+                        FROM
+                            sys_department_user sst1
+                        INNER JOIN
+                            sys_role_user sst2
+                        ON
+                            sst1.user_id = sst2.user_id
+                        AND
+                            sst2.role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'
+                    )
             )
         </if>
         ORDER BY t1.gmt_modified DESC
@@ -1050,17 +1143,42 @@
             </foreach>
         </if>
         <!-- 专管员（N员）区域（上报的）案件 -->
+<!--        <if test="isNPersonArea != null and isNPersonArea == 'true'">-->
+<!--        AND-->
+<!--            t1.creator IN (-->
+<!--                SELECT-->
+<!--                    user_id-->
+<!--                FROM-->
+<!--                sys_role_user-->
+<!--            WHERE-->
+<!--            &lt;!&ndash; 专管员角色ID &ndash;&gt;-->
+<!--            role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'-->
+<!--        )-->
+<!--        </if>-->
+        <!-- 专管员处理的案件 -->
         <if test="isNPersonArea != null and isNPersonArea == 'true'">
-        AND
-            t1.creator IN (
-                SELECT
-                    user_id
-                FROM
-                sys_role_user
+            AND
+                t1.report_case_id IN (
+            SELECT
+                st1.case_id
+            FROM
+                city_report_case_assign st1
             WHERE
-            <!-- 专管员角色ID -->
-            role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'
-        )
+                st1.is_delete = 0
+            AND
+                st1.handle_user_id IN (
+                    SELECT
+                        sst1.user_id
+                    FROM
+                        sys_department_user sst1
+                    INNER JOIN
+                        sys_role_user sst2
+                    ON
+                        sst1.user_id = sst2.user_id
+                    AND
+                        sst2.role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'
+                )
+            )
         </if>
         ORDER BY
             t1.gmt_modified DESC
@@ -1256,16 +1374,41 @@
             </foreach>
         </if>
         <!-- 专管员（N员）区域（上报的）案件 -->
+<!--        <if test="isNPersonArea != null and isNPersonArea == 'true'">-->
+<!--        AND-->
+<!--            t1.creator IN (-->
+<!--                SELECT-->
+<!--                    user_id-->
+<!--                FROM-->
+<!--                    sys_role_user-->
+<!--                WHERE-->
+<!--                    &lt;!&ndash; 专管员角色ID &ndash;&gt;-->
+<!--                    role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'-->
+<!--            )-->
+<!--        </if>-->
+        <!-- 专管员处理的案件 -->
         <if test="isNPersonArea != null and isNPersonArea == 'true'">
         AND
-            t1.creator IN (
+            t1.report_case_id IN (
                 SELECT
-                    user_id
+                    st1.case_id
                 FROM
-                    sys_role_user
+                    city_report_case_assign st1
                 WHERE
-                    <!-- 专管员角色ID -->
-                    role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'
+                    st1.is_delete = 0
+                AND
+                    st1.handle_user_id IN (
+                        SELECT
+                            sst1.user_id
+                        FROM
+                            sys_department_user sst1
+                        INNER JOIN
+                            sys_role_user sst2
+                        ON
+                            sst1.user_id = sst2.user_id
+                        AND
+                            sst2.role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'
+                )
             )
         </if>
         ORDER BY
@@ -1535,7 +1678,7 @@
             AND gmt_create <![CDATA[ <= ]]> #{endTime}
         </if>
         <if test="handleDepartmentId != null and handleDepartmentId != ''">
-        AND
+        AND (
             report_case_id IN (
                 SELECT
                     st1.case_id
@@ -1549,9 +1692,16 @@
                             sst1.user_id
                         FROM
                             sys_department_user sst1
+                        INNER JOIN
+                            sys_role_user sst2
+                        ON
+                            sst1.user_id = sst2.user_id
+                        AND
+                            sst2.role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a'
                         WHERE
                             sst1.department_id = #{handleDepartmentId}
                     )
+                )
             )
         </if>
     </select>
diff --git a/src/main/resources/static/route/assessment/list_day.html b/src/main/resources/static/route/assessment/list_day.html
index 988ec82..6d043a7 100755
--- a/src/main/resources/static/route/assessment/list_day.html
+++ b/src/main/resources/static/route/assessment/list_day.html
@@ -28,6 +28,7 @@
                             <select id="areaId" name="areaId" lay-filter="changeArea">
                                 <option value="">选择街镇</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
+                                {{#     if(item.dictId === 'e64a0a05-45ca-4452-a869-a4dcbff74593') { continue; } }}
                                 <option value="{{item.dictId}}">{{item.dictName}}</option>
                                 {{# } }}
                             </select>
diff --git a/src/main/resources/static/route/assessment/list_history.html b/src/main/resources/static/route/assessment/list_history.html
index 2b080a9..d6849c0 100755
--- a/src/main/resources/static/route/assessment/list_history.html
+++ b/src/main/resources/static/route/assessment/list_history.html
@@ -22,6 +22,7 @@
                             <select id="areaId" name="areaId" lay-filter="changeArea">
                                 <option value="">选择地区</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
+                                {{#     if(item.dictId === 'e64a0a05-45ca-4452-a869-a4dcbff74593') { continue; } }}
                                 <option value="{{item.dictId}}">{{item.dictName}}</option>
                                 {{# } }}
                             </select>
@@ -140,7 +141,6 @@
         //初始化社区
         function initCommunity(areaId) {
             top.restAjax.get('api/community/listcommunity?areaId=' + areaId, {}, null, function(code, data) {
-                console.log(data);
                 laytpl(document.getElementById('communitySelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('communitySelectTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/reportcase/case-statistic.html b/src/main/resources/static/route/reportcase/case-statistic.html
index 43f5eac..e98f43b 100644
--- a/src/main/resources/static/route/reportcase/case-statistic.html
+++ b/src/main/resources/static/route/reportcase/case-statistic.html
@@ -27,15 +27,15 @@
                                 {{# } }}
                             </select>
                         </script>
-                        <div class="layui-inline" id="communitySelectTemplateBox" style="width: 150px;"></div>
-                        <script id="communitySelectTemplate" type="text/html">
-                            <select id="communityId" name="communityId">
-                                <option value="">请选择社区</option>
-                                {{# for(var i = 0, item; item = d[i++];) { }}
-                                <option value="{{item.communityId}}">{{item.communityName}}</option>
-                                {{# } }}
-                            </select>
-                        </script>
+<!--                        <div class="layui-inline" id="communitySelectTemplateBox" style="width: 150px;"></div>-->
+<!--                        <script id="communitySelectTemplate" type="text/html">-->
+<!--                            <select id="communityId" name="communityId">-->
+<!--                                <option value="">请选择社区</option>-->
+<!--                                {{# for(var i = 0, item; item = d[i++];) { }}-->
+<!--                                <option value="{{item.communityId}}">{{item.communityName}}</option>-->
+<!--                                {{# } }}-->
+<!--                            </select>-->
+<!--                        </script>-->
                         <div class="layui-inline" id="caseTypeSelectTemplateBox" style="width: 150px;"></div>
                         <script id="caseTypeSelectTemplate" type="text/html">
                             <select id="caseTypeId" name="caseTypeId" lay-filter="changeCaseType">
@@ -93,7 +93,7 @@
 
         function init(){
             initArea();
-            initCommunity();
+            // initCommunity();
         }
         init();
 
@@ -111,7 +111,7 @@
 
         form.on('select(areaChange)',function(data){
             var areaId = data.value;
-            initCommunity(areaId);
+            // initCommunity(areaId);
         });
 
         //初始化社区
diff --git a/src/main/resources/static/route/usersignin/list.html b/src/main/resources/static/route/usersignin/list.html
index f8af60b..6ee7cbe 100755
--- a/src/main/resources/static/route/usersignin/list.html
+++ b/src/main/resources/static/route/usersignin/list.html
@@ -28,6 +28,7 @@
                             <select id="areaId" name="areaId" lay-filter="changeArea">
                                 <option value="">选择街镇</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
+                                {{#     if(item.dictId === 'e64a0a05-45ca-4452-a869-a4dcbff74593') { continue; } }}
                                 <option value="{{item.dictId}}">{{item.dictName}}</option>
                                 {{# } }}
                             </select>
diff --git a/src/main/resources/static/route/usersignout/list.html b/src/main/resources/static/route/usersignout/list.html
index 7edd822..a53c75e 100755
--- a/src/main/resources/static/route/usersignout/list.html
+++ b/src/main/resources/static/route/usersignout/list.html
@@ -22,6 +22,7 @@
                             <select id="areaId" name="areaId" lay-filter="changeArea">
                                 <option value="">选择地区</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
+                                {{#     if(item.dictId === 'e64a0a05-45ca-4452-a869-a4dcbff74593') { continue; } }}
                                 <option value="{{item.dictId}}">{{item.dictName}}</option>
                                 {{# } }}
                             </select>