From 51cf45fa766bac2c7eba7641723781c5e7a13c64 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 02 Dec 2020 14:50:25 +0800
Subject: [PATCH] 修改获取列表的bug
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html | 3 ++-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 3 ---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
index b0110e0..82410ab 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
@@ -227,9 +227,6 @@
public PageResult<ProductOrderDetailVo> departmentProductDetail(Map<String, Object> params) {
Page<ProductOrderDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
Boolean enabled = MapUtils.getBoolean(params, "enabled");
- if(enabled==null){
- enabled=true;
- }
List<ProductOrderDetail> list =
baseMapper.departmentProductDetail(page, Long.parseLong(params.get("hospitalId").toString()),Long.parseLong(params.get("departmentId").toString()),enabled);
List<ProductOrderDetailVo> listvo = new ArrayList<>();
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
index d0c691b..8feeec5 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
@@ -340,7 +340,8 @@
method: 'GET',
where: {
'hospitalId': data.hospitalId,
- 'departmentId': data.departmentId
+ 'departmentId': data.departmentId,
+ 'enabled': 1
},
headers: {
'Authorization': 'Bearer ' + config.getToken().access_token
--
Gitblit v1.8.0