出库管理优化

platform-dao/src/main/resources/mapper/store/OutStoreFormMapper.xml

@@ -161,6 +161,25 @@ outstoreform.process_instance_id,
             <if test="userId != null and userId != ''">
                 and outstoreform.created_user_id = #{userId}
             </if>
+            <if test="yyId!=null and yyId!=''">
+                and outstoreform.yy_id = #{yyId}
+            </if>
+            <if test="applyDept!=null and applyDept!=''">
+                and outstoreform.apply_dept = #{applyDept}
+            </if>
+            <if test="status!=null">
+                and outstoreform.status = #{status}
+            </if>
+            <if test="searchTimeStart!=null">
+                and outstoreform.user_time <![CDATA[ >= ]]> #{searchTimeStart}
+            </if>
+            <if test="searchTimeEnd!=null">
+                and outstoreform.user_time <![CDATA[ <= ]]> #{searchTimeEnd}
+            </if>
+            <if test="type!=null">
+                and outstoreform.type = #{type}
+            </if>
+
         </where>
     </select>
 

platform-rest/src/main/java/com/platform/rest/controller/sb/SbInfoController.java

@@ -585,7 +585,6 @@ public class SbInfoController {
     }
 
     private List<String> getSbIds(List<String> ids){
-
         if (ids!=null&&ids.size()>0) {
             List<String> childIds = sbInfoMapper.getChildIds(ids);
             ids.addAll(childIds);