Browse Source

feature: 订餐订单下载权限问题

wuyongyi 2 years ago
parent
commit
61dc8b3216

+ 2 - 1
src/main/java/com/ywt/mg/services/MealOrderService.java

@@ -142,7 +142,8 @@ public class MealOrderService {
          */
         String shopId = Checker.getStringValue(request.getShopId());
         String shopIds = Checker.getStringValue(request.getShopIds());
-        if (!Checker.isNone(shopId)) {
+        int hosp = Checker.getIntegerValue(request.getHosp());
+        if (!Checker.isNone(shopId) || hosp == 1) {
             int shopIdInt = Integer.parseInt(shopId);
             if (shopIdInt > 0) {
                 whereSql += " and ( shop_id = ?)";

+ 2 - 0
src/main/java/com/ywt/mg/web/controllers/hospital/HospMealOrderController.java

@@ -73,6 +73,7 @@ public class HospMealOrderController {
                     request.setShopIds(shopIds);
                     Boolean bIsStaff = getIsStaffParamCompat(request.getIsStaff());
                     request.setbIsStaff(bIsStaff);
+                    request.setHosp(1);
                     mealOrderService.downloadMealOrderListNew(downloadRecordId, fileName, request);
                 } catch (AppMessageException e) {
                     logger.error("MealOrderController#downloadMealOrderList(orderNo={} , name={} , mobile={} , type={} , " +
@@ -131,6 +132,7 @@ public class HospMealOrderController {
                         shopIds = URLDecoder.decode(request.getShopIds(), "UTF-8");
                     }
                     request.setShopIds(shopIds);
+                    request.setHosp(1);
                     mealOrderService.downloadMealOrderBillList(downloadRecordId, fileName, request);
                 } catch (Exception e) {
                     logger.error("MealOrderController#downloadMealOrderList(orderNo={} , name={} , mobile={} , type={} , " +