From fdf2903b8944b80877e7df5d0da38f34b5d84ed9 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期一, 04 十二月 2023 15:02:28 +0800 Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1 --- src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java index 323374f..dfe98c9 100644 --- a/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java @@ -25,7 +25,8 @@ @Override public List<ManPakOut> selectByLocType(String locType) { - return this.selectList(new EntityWrapper<ManPakOut>().like("loc_no",locType).eq("status",1)); + return this.selectList(new EntityWrapper<ManPakOut>().like("loc_no",locType+"-") + .andNew().eq("status",0).or().eq("status",8)); } @Override -- Gitblit v1.9.1