|
|
@@ -105,16 +105,6 @@ public class WebpageController extends BaseController {
|
|
|
return "/admin/set";
|
|
|
}
|
|
|
|
|
|
- /*@RequestMapping(value = "/admin/userManage", method = RequestMethod.GET)
|
|
|
- public String adminUserManage(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return "/admin/userManage";
|
|
|
- }
|
|
|
-
|
|
|
- @RequestMapping(value = "/admin/servicesManage/patent", method = RequestMethod.GET)
|
|
|
- public String adminServicesManagePatent(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return "/admin/servicesManage/patent";
|
|
|
- }*/
|
|
|
-
|
|
|
@RequestMapping(value = "/admin/userManage", method = RequestMethod.GET)
|
|
|
public ModelAndView adminUserManage(HttpServletRequest request, ModelAndView modelview) {
|
|
|
return adminToLogin(request,modelview,"/admin/userManage");
|
|
|
@@ -155,6 +145,16 @@ public class WebpageController extends BaseController {
|
|
|
return adminToLogin(request,modelview,"/admin/index");
|
|
|
}
|
|
|
|
|
|
+ @RequestMapping(value = "/portal/search/achievement", method = RequestMethod.GET)
|
|
|
+ public ModelAndView portalSearchAchievement(HttpServletRequest request, ModelAndView modelview) {
|
|
|
+ return adminToLogin(request,modelview,"/portal/search/achievement");
|
|
|
+ }
|
|
|
+
|
|
|
+ @RequestMapping(value = "/portal/search/demand", method = RequestMethod.GET)
|
|
|
+ public ModelAndView portalSearchDemand(HttpServletRequest request, ModelAndView modelview) {
|
|
|
+ return adminToLogin(request,modelview,"/portal/search/demand");
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
private ModelAndView userLogin(HttpServletRequest request, ModelAndView modelview, String next) {
|
|
|
String key = TokenManager.getUserId();
|