wuwen 5 years ago
parent
commit
e78409e820

+ 2 - 1
src/main/java/com/ssj/api/controller/ApiTrainController.java

@@ -415,6 +415,7 @@ public class ApiTrainController extends BaseController {
     		params.put("roleType", requestVO.getRoleType());
     		params.put("module", requestVO.getModule());
     		params.put("name", requestVO.getName());
+    		params.put("type",2);
     		
             Page<Map<String,Object>> page = videoFileService.findVideoFileByPage(params, initPage(requestVO.getPageNo(), requestVO.getPageSize()));
             List<Map<String,Object>> videoFiles=page.getContent();
@@ -433,7 +434,7 @@ public class ApiTrainController extends BaseController {
             	list.add(dataMap);
 			}
             data.put("pages", page.getTotalPages());
-            data.put("totals", page.getTotalElements());
+            data.put("totals", Integer.parseInt(page.getTotalElements()+""));
             data.put("pageNo", requestVO.getPageNo());
             data.put("pageSize", requestVO.getPageSize());
             data.put("list", list);

+ 2 - 2
src/main/java/com/ssj/sys/interceptor/LoginInterceptor.java

@@ -183,8 +183,8 @@ public class LoginInterceptor extends HandlerInterceptorAdapter{
     }
 
     public static void initModelAndView(HttpServletRequest request, ModelAndView modelAndView) throws Exception {
-        //modelAndView.addObject("sysUrl", PropertiesUtil.getValue("sys_url")+"/ssj");
-        modelAndView.addObject("sysUrl", "http://127.0.0.1:8080/");
+        modelAndView.addObject("sysUrl", PropertiesUtil.getValue("sys_url")+"/ssj");
+        //modelAndView.addObject("sysUrl", "http://127.0.0.1:8080/");
         modelAndView.addObject("imgUrl", PropertiesUtil.getValue("STATIC_FILE_URL"));
 
     }