综合查询添加场景分类和乡镇查询条件

event-ui/src/views/event/eventcatalogue/index.vue

@@ -36,8 +36,8 @@
                      :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="场景分类" prop="eventTypeId">
-        <el-select v-model="queryParams.eventTypeId" placeholder="请选择场景分类" clearable
+      <el-form-item label="场景分类" prop="eventTypeXls">
+        <el-select v-model="queryParams.eventTypeXls" placeholder="请选择场景分类" clearable
                    @keyup.enter.native="handleQuery">
           <el-option label="耕地保护" value="218, 219"></el-option>
           <el-option label="违法畜牧" value="222, 219"></el-option>
@@ -452,7 +452,6 @@
           isUrged: undefined,
           eventStatusValue: undefined,
           eventTypeXls: [],
-          eventTypeId: [],
           deptId: undefined
         },
         // 表单校验

src/main/resources/mapper/centereventteventcatalogue/CentereventTEventcatalogueMapper.xml

@@ -56,12 +56,6 @@
         left join centerevent_t_dept_event d on d.event_code = a.event_code
         left join ${database_system}.sys_dept c on c.dept_id = d.dept_id
         <where>
-            <if test="eventTypeId != null and eventTypeId.length > 0">
-                and event_type_xl in
-                <foreach item="eventTypeId" collection="eventTypeId" open="(" separator="," close=")">
-                    #{eventTypeId}
-                </foreach>
-            </if>
             <if test="deptId != null and deptId != ''">
                 AND (c.dept_id = #{deptId} or FIND_IN_SET(#{deptId},c.ancestors))
             </if>