|
|
@@ -66,7 +66,8 @@ public class OrderController extends BaseController
|
|
|
if(param.getOrderTypeFilter() == null || param.getOrderTypeFilter().equals("2")){
|
|
|
return getDataTable(new ArrayList<>());
|
|
|
}
|
|
|
-
|
|
|
+ CompanyUser user = SecurityUtils.getLoginUser().getUser();
|
|
|
+ param.setCompanyId(user.getCompanyId());
|
|
|
startPage();
|
|
|
List<MergedOrderVO> list = mergedOrderService.selectMergedOrderList(param);
|
|
|
for (MergedOrderVO vo : list) {
|