From 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 02 Dec 2020 14:39:08 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/controller/ProfessionController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ProfessionController.java b/src/main/java/com/moral/controller/ProfessionController.java
index bfa2aa6..10138a7 100644
--- a/src/main/java/com/moral/controller/ProfessionController.java
+++ b/src/main/java/com/moral/controller/ProfessionController.java
@@ -9,6 +9,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.Optional;
@RestController
@RequestMapping("profession")
@@ -16,7 +17,8 @@
@Resource
ProfessionService professionService;
@GetMapping(value = "getall")
- public ResultBean<List<Profession>> getALL(){
- return new ResultBean<>(professionService.getProfessiontList());
+ public ResultBean<List<Profession>> getALL(Optional<String> name){
+ String queryName = name.isPresent()?name.get():null;
+ return new ResultBean<>(professionService.queryByName(queryName));
}
}
--
Gitblit v1.8.0