【fix-bug】

src/main/java/com/zzsn/event/mapper/xml/EventMapper.xml

@@ -50,7 +50,7 @@
     </select>
 
     <select id="pageList" resultType="com.zzsn.event.vo.EventManageVO">
-        select t2.type_name,t1.id,t1.event_icon,t1.event_name,m.subjectTypeName,t1.event_label,t1.status,
+        select t2.type_name,t1.id,t1.event_icon,t1.event_name,m.subjectTypeName,t1.event_label,t1.status,t1.event_code,
         t1.face_public,t1.publish_status,t1.create_time,t1.publish_date,t1.start_time,t1.end_time,t1.create_by,t1.data_scope
         from event t1
         inner join event_category t2 on t1.event_type =t2.id

src/main/java/com/zzsn/event/mapper/xml/SubjectTypeMapper.xml

@@ -241,10 +241,11 @@
     </select>
 
     <select id="allList" resultType="com.zzsn.event.entity.SubjectType">
-        select t.* from subject_type t where 1=1
+        select t.* from subject_type t
         <if test="userId !=null and userId != ''">
             inner join sys_user_data_permission dp on t.id=dp.permission_id and dp.user_id = #{userId}
         </if>
+        where 1=1
         <if test="category !=null">
             and t.category = #{category}
         </if>

src/main/java/com/zzsn/event/vo/EventManageVO.java

@@ -30,6 +30,8 @@ public class EventManageVO {
     private String endTime;
     private Integer status;
     private String dataScope;
+    private String eventCode;
+
     /**专题题绑定流程信息*/
     private List<ClbModelArrange> clbModelArranges;
 }