From bd1e1c6a99c228ece8ece17be462b81d5494c7a1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 24 六月 2025 21:01:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
index a1dd7c3..36138e4 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
@@ -31,10 +31,9 @@
public R<Page<TCompany>> unitPage(@RequestBody UnitListQueryDto unitListQueryDto) {
Page<TCompany> page = companyService.lambdaQuery()
.orderByDesc(TCompany::getCreateTime)
- .like(unitListQueryDto.getCompanyName() != null && unitListQueryDto.getCompanyName().isEmpty(), TCompany::getName, unitListQueryDto.getCompanyName())
+ .like(unitListQueryDto.getCompanyName() != null && unitListQueryDto.getCompanyName()!="", TCompany::getName, unitListQueryDto.getCompanyName())
.page(Page.of(unitListQueryDto.getPageCurr(), unitListQueryDto.getPageSize()));
return R.ok(page);
-
}
//单位添加
@@ -51,5 +50,10 @@
public R delete(@RequestParam("id") Integer id) {
return R.ok(companyService.removeById(id));
}
+
+ @PostMapping(value = "/unit/detail")
+ public R detail(@RequestParam("id") Integer id) {
+ return R.ok(companyService.getById(id));
+ }
}
--
Gitblit v1.7.1