459242451@qq.com 3 years ago
parent
commit
117d83fe6a

+ 7 - 16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/ResourceController.java

@@ -100,22 +100,13 @@ public class ResourceController extends BaseController {
     @GetMapping("/goodsList")
     @Security
     public TableDataInfo<ResourceVo> goodsList(@Validated(QueryGroup.class) ResourceBo bo) {
-
-        if (bo.getResourceType() != null && bo.getResourceType() == 1 && StrUtil.isNotBlank(bo.getGoodsName())) {
-            // 模糊查询有哪些仓库存在此物资
-            List<Object> objects = iResourceDetailService.listObjs(new QueryWrapper<ResourceDetail>()
-                .select("distinct resource_id")
-                .like("name", bo.getGoodsName()));
-            if (objects != null && objects.size() > 0) {
-                bo.setResourceIds(objects);
-            } else {
-                TableDataInfo<ResourceVo> rspData = new TableDataInfo<>();
-                rspData.setCode(HttpStatus.HTTP_OK);
-                rspData.setMsg("查询成功");
-                rspData.setRows(Collections.emptyList());
-                rspData.setTotal(0);
-                return rspData;
-            }
+        bo.setResourceType(1);
+        // 模糊查询有哪些仓库存在此物资
+        List<Object> objects = iResourceDetailService.listObjs(new QueryWrapper<ResourceDetail>()
+            .select("distinct resource_id")
+            .like(StrUtil.isNotBlank(bo.getGoodsName()), "name", bo.getGoodsName()));
+        if (objects != null && objects.size() > 0) {
+            bo.setResourceIds(objects);
         }
         return iResourceService.queryPageList(bo);
     }

BIN
ruoyi-admin/src/main/resources/word/incidentDetail.docx