|
|
@@ -137,7 +137,7 @@ public class KwOrderService {
|
|
|
Long userId = LoginUserHolder.getUserId();
|
|
|
Criteria criteria = new Criteria();
|
|
|
String topEnt = Objects.equals(params.getOrderType(), 1) ? "procureTopEntId" : "supplyTopEntId";
|
|
|
- criteria.and(topEnt).is(entId).and("delFlag").is(0);
|
|
|
+ criteria.and("delFlag").is(0);
|
|
|
//日期范围
|
|
|
if (Objects.nonNull(params.getStartCreateTime()) && Objects.nonNull(params.getEndCreateTime())) {
|
|
|
criteria.and("createTime").gte(params.getStartCreateTime()).lte(params.getEndCreateTime());
|
|
|
@@ -190,11 +190,14 @@ public class KwOrderService {
|
|
|
if (Objects.equals(params.getStatus(), 0)) {
|
|
|
//草稿状态只能创建订单的人能看
|
|
|
criteria.and("createBy").is(userId);
|
|
|
+ }else {
|
|
|
+ criteria.and(topEnt).is(entId);
|
|
|
}
|
|
|
} else {
|
|
|
- //非草稿状态or草稿状态且是当前人且一级企业匹配
|
|
|
+ //非草稿状态且一级企业匹配or草稿状态且是当前人
|
|
|
Criteria orOperator = new Criteria().orOperator(
|
|
|
- Criteria.where("status").ne(0),
|
|
|
+ new Criteria().andOperator(Criteria.where("status").ne(0),
|
|
|
+ Criteria.where(topEnt).is(entId)),
|
|
|
new Criteria().andOperator(Criteria.where("status").is(0),
|
|
|
Criteria.where("createBy").is(userId)));
|
|
|
orOperators.add(orOperator);
|