|
@@ -205,10 +205,10 @@ public class TOrderController {
|
|
|
query.eq(TOrder::getProductNo, productNo);
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(sn)) {
|
|
|
- query.like(TOrder::getSn, sn);
|
|
|
+ query.eq(TOrder::getSn, sn);
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(trxNo)) {
|
|
|
- query.like(TOrder::getTrxNo, trxNo);
|
|
|
+ query.eq(TOrder::getTrxNo, trxNo);
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(status)) {
|
|
|
query.eq(TOrder::getStatus, status);
|
|
@@ -855,7 +855,6 @@ public class TOrderController {
|
|
|
param.setIfForeign(isForeignUser(adminId));
|
|
|
log.info("param:{}", param);
|
|
|
FgObjectUtil.objectNullOrEmptySel(param, "chartType$");
|
|
|
-// String adminId = param.getAdminId();
|
|
|
ChartColumn chartColumn = new ChartColumn();
|
|
|
if (StringUtils.isNotEmpty(adminId)) {
|
|
|
TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(adminId)));
|
|
@@ -899,10 +898,6 @@ public class TOrderController {
|
|
|
} else {
|
|
|
TAdminEquipment adminEquipment = R.getDataIfSuccess(szwlFeign.getClientIdList(String.valueOf(admin.getId())));
|
|
|
if (!adminEquipment.getType().equals("0")) {
|
|
|
-// TAdmin admin1 = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(admin.getParentId())));
|
|
|
-// param.setAdminId(admin1.getId().toString());
|
|
|
-// param.setAdminId(admin.getParentId().toString());
|
|
|
-// } else {
|
|
|
List<String> list = R.getDataIfSuccess(szwlFeign.getClientIds(adminId));
|
|
|
param.setClientIds(list);
|
|
|
if (StringUtils.isNotEmpty(adminEquipment.getEquipmentIds())) {
|
|
@@ -1034,10 +1029,10 @@ public class TOrderController {
|
|
|
|
|
|
LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
|
|
|
if (StringUtils.isNotEmpty(sn)) {
|
|
|
- query.like(TOrder::getSn, sn);
|
|
|
+ query.eq(TOrder::getSn, sn);
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(productName)) {
|
|
|
- query.like(TOrder::getProductName, productName);
|
|
|
+ query.eq(TOrder::getProductName, productName);
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(status)) {
|
|
|
if (status.equals("unpay")) {
|
|
@@ -1061,7 +1056,7 @@ public class TOrderController {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- query.like(TOrder::getClientId, clientId);
|
|
|
+ query.eq(TOrder::getClientId, clientId);
|
|
|
|
|
|
int size = 20;
|
|
|
int current = pageNumber;
|