修改bug

src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java

@@ -14,7 +14,7 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
     private String code;
     private String name;
     private String deptCode;
-    private Boolean advanceType;
+    private Integer advanceType;
     private Boolean isDefault;
     private Date updateTime;
     private Integer level;

src/main/java/com/glxp/api/service/auth/DeptService.java

@@ -11,7 +11,7 @@ import java.util.List;
 public interface DeptService {
 
     List<String> selectByIdCode(List<String> list);
-    DeptEntity findDefault(Boolean advaceType, Boolean isDefault);
+    DeptEntity findDefault(Integer advaceType, Boolean isDefault);
 
     DeptEntity selectMaxCode(FilterInvWarehouseRequest filterInvWarehouseRequest);
 

src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java

@@ -28,7 +28,7 @@ public class DeptServiceImpl implements DeptService {
     }
 
     @Override
-    public DeptEntity findDefault(Boolean advaceType, Boolean isDefault) {
+    public DeptEntity findDefault(Integer advaceType, Boolean isDefault) {
         FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
         filterInvWarehouseRequest.setIsDefault(isDefault);
         filterInvWarehouseRequest.setAdvanceType(advaceType);

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -92,7 +92,7 @@
 
             <if test="supInoivceSearch != null">
                 <if test="invoiceActions1 != null and invoiceActions1.size() != 0">
-                    AND (`action` in
+                    AND ((`action` in
                     <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
@@ -104,10 +104,33 @@
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
+                    and status = 7
+                            ))
+                </if>
+            </if>
+
+            <if test="supInoivceSearch != null and invoiceActions1 == null and invoiceActions1.size() == 0 ">
+
+                <if test="invoiceActions2 != null and invoiceActions2.size() != 0">
+                    and (
+                    `action` in
+                    <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
                     and status = 7
                     )
                 </if>
             </if>
+            <if test="supInoivceSearch != null and invoiceActions2 == null and invoiceActions2.size()== 0 ">
+                <if test="invoiceActions1 != null and invoiceActions1.size() != 0">
+                    AND (`action` in
+                    <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    and status = 10)
+                </if>
+            </if>
+
         </where>
         order by createTime desc
     </select>