anderx лет назад: 3
Родитель
Сommit
cc476bfa0d
1 измененных файлов с 6 добавлено и 1 удалено
  1. 6 1
      src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

+ 6 - 1
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -147,7 +147,12 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		if(o.getDeps()==null){
 		if(o.getDeps()==null){
 			params.put("deps", aDep);
 			params.put("deps", aDep);
 		}else {
 		}else {
-			params.put("deps", departmentService.comparePermissions(aDep,o.getDeps()));
+			aDep=departmentService.comparePermissions(aDep,o.getDeps());
+			if (aDep.isEmpty()){
+				return new Pagination<>(1,10,0);
+			}
+			params.put("deps", aDep);
+
 		}
 		}
 		if(o.getType()!=null)params.put("type", o.getType());
 		if(o.getType()!=null)params.put("type", o.getType());