|
@@ -53,7 +53,26 @@ public class PersonController {
|
|
|
public R<Void> update(@Validated({Update.class}) @RequestBody Person person) {
|
|
|
User currentUser = SessionUtils.currentUser();
|
|
|
person.setModifyBy(currentUser.getId());
|
|
|
- return personService.update(person) ? R.ok() : R.fail("保存失败");
|
|
|
+ return personService.update(person) ? R.ok() : R.fail("更新失败");
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 保存人员
|
|
|
+ *
|
|
|
+ * @param person
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @PostMapping("/save")
|
|
|
+ public R<Void> save(@Validated @RequestBody Person person) {
|
|
|
+ User currentUser = SessionUtils.currentUser();
|
|
|
+ if(person.getId() != null) {
|
|
|
+ person.setModifyBy(currentUser.getId());
|
|
|
+ return personService.update(person) ? R.ok() : R.fail("更新失败");
|
|
|
+ } else {
|
|
|
+ person.setCreateBy(currentUser.getId());
|
|
|
+ return personService.add(person) ? R.ok() : R.fail("新增失败");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -62,8 +81,8 @@ public class PersonController {
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
- @GetMapping("/detail/{id}")
|
|
|
- public R<PersonVo> detail(@PathVariable Long id) {
|
|
|
+ @GetMapping("/detail")
|
|
|
+ public R<PersonVo> detail(@RequestParam Long id) {
|
|
|
Person person = personService.findById(id);
|
|
|
return R.data(this.toPersonVo(person));
|
|
|
}
|
|
@@ -108,14 +127,14 @@ public class PersonController {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
- @GetMapping("/listOption")
|
|
|
+ @PostMapping("/listOption")
|
|
|
public R<List<Pair<String, Long>>> listOption(@RequestBody PageQuery<Map<String, Object>> pageQuery) {
|
|
|
User currentUser = SessionUtils.currentUser();
|
|
|
Map<String, Object> mapCondition = pageQuery.getTerms(new HashMap<>());
|
|
|
//查询和当前登录用户相关的人员
|
|
|
mapCondition.put("createBy", currentUser.getId());
|
|
|
List<Person> personList = personService.findPage(pageQuery);
|
|
|
- List<Pair<String, Long>> personOptionList = Pair.toList(personList, e -> e.getCallName() + "(" + e.getName() + ")", Person::getId);
|
|
|
+ List<Pair<String, Long>> personOptionList = Pair.toList(personList, e -> e.getName() + "(" + e.getCallName() + ")", Person::getId);
|
|
|
return R.data(personOptionList);
|
|
|
}
|
|
|
|