sql优化

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

@@ -63,13 +63,20 @@
 
     <select id="subjectsByFacePublic" resultType="com.zzsn.event.vo.SubjectTreeVO">
         select s.id,
-               s.subject_name as name,
-               'true'         as ynSubject,
-               s.time_enable  as start_time,
-               s.time_disable as end_time
+        s.subject_name as name,
+        'true' as ynSubject,
+        s.time_enable as start_time,
+        s.time_disable as end_time
         from subject s
         where
-        ((s.face_public = #{facePublic} and s.create_by = #{username}) or (s.face_public = #{facePublic} and ${sql}))
+        <choose>
+            <when test="sql != null and sql != ''">
+                ((s.face_public = #{facePublic} and s.create_by = #{username}) or (s.face_public = #{facePublic} and ${sql}))
+            </when>
+            <otherwise>
+                (s.create_by = #{username} or s.face_public = #{facePublic})
+            </otherwise>
+        </choose>
         <if test="subjectType!=null">
             and s.subject_type = #{subjectType}
         </if>