|
|
@@ -5,10 +5,8 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.uas.platform.core.model.PageInfo;
|
|
|
import com.uas.platform.core.model.PageParams;
|
|
|
import com.uas.platform.core.web.bind.RequestState;
|
|
|
-import com.uas.service.donate.core.support.SystemSession;
|
|
|
import com.uas.service.donate.model.Project;
|
|
|
import com.uas.service.donate.model.SearchFilter;
|
|
|
-import com.uas.service.donate.model.User;
|
|
|
import com.uas.service.donate.service.ProjectService;
|
|
|
import com.uas.service.donate.util.FileUrl;
|
|
|
import com.uas.service.donate.util.HttpUtils;
|
|
|
@@ -90,8 +88,6 @@ public class ProjectController{
|
|
|
public Page<Project> getOrgProjects(PageParams params, String searchFilter, HttpServletRequest request){
|
|
|
PageInfo pageInfo = new PageInfo(params);
|
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
|
- User user = (User)request.getSession().getAttribute("user");
|
|
|
- SystemSession.setUser(user);
|
|
|
return projectService.getOrgProjects(pageInfo, filter);
|
|
|
}
|
|
|
|
|
|
@@ -141,8 +137,6 @@ public class ProjectController{
|
|
|
@RequestMapping(value = "/status",method = RequestMethod.GET)
|
|
|
public Page<Project> findStatus(String status,int page ,int size, HttpServletRequest request){
|
|
|
Pageable pageable=new PageRequest(page,size);
|
|
|
- User user = (User)request.getSession().getAttribute("user");
|
|
|
- SystemSession.setUser(user);
|
|
|
if("进行中".equals(status)){
|
|
|
return projectService.findInProcess(pageable);
|
|
|
}
|
|
|
@@ -207,9 +201,6 @@ public class ProjectController{
|
|
|
@ResponseBody
|
|
|
@RequestMapping(value = "/detail/{id}",method = RequestMethod.GET)
|
|
|
public Project showDetail(@PathVariable("id") Long id, HttpServletRequest request) {
|
|
|
-// User user = (User)request.getSession().getAttribute("user");
|
|
|
-// SystemSession.setUser(user);
|
|
|
- System.out.println(SystemSession.getUser());
|
|
|
return projectService.findOne(id);
|
|
|
}
|
|
|
|