sql修改

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml

@@ -43,18 +43,23 @@
         <if test='par.typeCode != null'>and a.type_code = #{par.typeCode}</if>
         <if test='par.companyCode != null'>and a.company_code = #{par.companyCode}</if>
         <if test='par.name != null'>and a.name like concat('%', #{par.name}, '%')</if>
-        <if test='par.nodeType != null and par.nodeType == "1" and par.nodeIds != null and par.nodeIds.size() > 0'>
+        <if test='par.nodeType != null and par.nodeType == "1" and par.nodeIds != null'>
             and a.company in
             <foreach collection="par.nodeIds" separator="," open="(" item="nodeId" close=")">
                 #{nodeId}
             </foreach>
         </if>
-        <if test='par.nodeType != null and par.nodeType == "0" and par.nodeIds != null and par.nodeIds.size() > 0'>
-            and a.parent in
-            <foreach collection="par.nodeIds" separator="," open="(" item="nodeId" close=")">
-                #{nodeId}
-            </foreach>
-            or a.sequence_nbr = #{par.nodeId}
+        <if test='par.nodeType != null and par.nodeType == "0" and par.nodeIds != null'>
+            <if test="par.nodeIds.size() > 0" >
+                and a.parent in
+                <foreach collection="par.nodeIds" separator="," open="(" item="nodeId" close=")">
+                    #{nodeId}
+                </foreach>
+                or a.sequence_nbr = #{par.nodeId}
+            </if>
+            <if test="par.nodeIds.size() == 0" >
+                and a.sequence_nbr = #{par.nodeId}
+            </if>
         </if>
     </select>
     <select id="listFireTeamDto" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireTeamDto">