|
@@ -1,8 +1,8 @@
|
|
package com.anyway.favor.controller;
|
|
package com.anyway.favor.controller;
|
|
|
|
|
|
-import com.anyway.favor.model.dto.FavorDto;
|
|
|
|
import com.anyway.favor.model.Favor;
|
|
import com.anyway.favor.model.Favor;
|
|
import com.anyway.favor.model.User;
|
|
import com.anyway.favor.model.User;
|
|
|
|
+import com.anyway.favor.model.dto.FavorDto;
|
|
import com.anyway.favor.service.FavorService;
|
|
import com.anyway.favor.service.FavorService;
|
|
import com.anyway.util.PageQuery;
|
|
import com.anyway.util.PageQuery;
|
|
import com.anyway.util.R;
|
|
import com.anyway.util.R;
|
|
@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
+import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
@@ -61,19 +62,18 @@ public class FavorController {
|
|
* @param pageQuery
|
|
* @param pageQuery
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @ResponseBody
|
|
|
|
- @RequestMapping("/listPage")
|
|
|
|
|
|
+ @GetMapping("/listPage")
|
|
public R<List<Favor>> listPage(@RequestBody PageQuery<Map<String, Object>> pageQuery) {
|
|
public R<List<Favor>> listPage(@RequestBody PageQuery<Map<String, Object>> pageQuery) {
|
|
User currentUser = SessionUtils.currentUser();
|
|
User currentUser = SessionUtils.currentUser();
|
|
- Map<String, Object> mapCondition = pageQuery.getTerms();
|
|
|
|
|
|
+ Map<String, Object> mapCondition = pageQuery.getTerms(new HashMap<>());
|
|
//查询和当前登录用户相关的人员
|
|
//查询和当前登录用户相关的人员
|
|
- mapCondition.put("relatedId", currentUser.getId());
|
|
|
|
|
|
+ mapCondition.put("createBy", currentUser.getId());
|
|
List<Favor> favorList = favorService.findPage(pageQuery);
|
|
List<Favor> favorList = favorService.findPage(pageQuery);
|
|
return R.page(favorList, pageQuery.getPage());
|
|
return R.page(favorList, pageQuery.getPage());
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * 跳转人情详情页面
|
|
|
|
|
|
+ * 人情事件详情
|
|
*
|
|
*
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@@ -89,7 +89,7 @@ public class FavorController {
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@PostMapping("/delete/{id}")
|
|
@PostMapping("/delete/{id}")
|
|
- public R delete(@PathVariable Long id) {
|
|
|
|
|
|
+ public R<Boolean> delete(@PathVariable Long id) {
|
|
boolean b = favorService.deleteById(id);
|
|
boolean b = favorService.deleteById(id);
|
|
return b ? R.ok() : R.fail("删除失败");
|
|
return b ? R.ok() : R.fail("删除失败");
|
|
}
|
|
}
|