[CODE]: 费用名称多个 in

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -172,7 +172,11 @@ public class TFeeServiceImpl implements ITFeeService {
             }
         }
         Map<String, Object> map = new HashMap<>();
-        map.put("feeIdList", feeIdList);
+        if(feeIdList != null && !feeIdList.isEmpty()){
+            map.put("feeIdList", feeIdList);
+        }else{
+            map.put("feeIdList", "");
+        }
         map.put("tWareHouseFees", tWareHouseFees);
         return tFeeMapper.warehouseBillsFeesList(map);
     }

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -183,12 +183,12 @@
             <if test="map.tWareHouseFees.fToCorpid != null  and map.tWareHouseFees.fToCorpid != ''">and w.f_corpid = #{map.tWareHouseFees.fToCorpid} </if>
             <if test="map.tWareHouseFees.fMblno != null  and map.tWareHouseFees.fMblno != ''">and t.f_mblno  like concat('%', #{map.tWareHouseFees.fMblno}, '%') </if>
             <if test="map.tWareHouseFees.fStatementNo != null and map.tWareHouseFees.fStatementNo != ''">and w.f_statement_no  like concat('%', #{map.tWareHouseFees.fStatementNo}, '%') </if>
-            <!--<if test="map.feeIdList != null  and  map.feeIdList != '' ">
+            <if test="map.feeIdList != null  and  map.feeIdList != '' ">
                 and  w.f_feeid in
                 <foreach collection="feeIdList" item="id" index="index" open="(" close=")" separator=",">
                     #{id}
                 </foreach>
-            </if>-->
+            </if>
             <if test='map.tWareHouseFees.timeExamine != null and map.tWareHouseFees.timeExamine[0] != null and map.tWareHouseFees.timeExamine[0]!= ""'>
                 and t.f_review_date &gt;= #{map.tWareHouseFees.timeExamine[0]}
             </if>