瀏覽代碼

修改bug

lidongyang 5 年之前
父節點
當前提交
306f4658e4

+ 5 - 1
src/main/java/com/lightinit/hsdataplatform/controller/admin/ResourceDataRegisterController.java

@@ -15,6 +15,8 @@ import com.lightinit.hsdataplatform.model.admin.*;
 import com.lightinit.hsdataplatform.service.admin.IResourceAPIRegisterService;
 import com.lightinit.hsdataplatform.service.admin.IResourceDataRegisterService;
 import org.apache.commons.lang.StringUtils;
+import org.jasig.cas.client.util.AbstractCasFilter;
+import org.jasig.cas.client.validation.Assertion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +29,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import javax.validation.Valid;
 import java.io.File;
@@ -55,7 +58,8 @@ public class ResourceDataRegisterController extends BaseController {
     }
 
     @RequestMapping(value = "list.action")
-    public ModelAndView list(ResourceDataRegisterSearchModel inputModel, @RequestParam(defaultValue = "1") int pageNo,HttpSession session) {
+    public ModelAndView list(ResourceDataRegisterSearchModel inputModel, @RequestParam(defaultValue = "1") int pageNo, HttpSession session,
+                             HttpServletRequest request) {
         LoginUser loginUser = (LoginUser) session.getAttribute(LoginUser.SESSION_KEY_LOGIN_USER);
         inputModel.setUserId(loginUser.getId());
         ModelAndView modelAndView = new ModelAndView("admin/data_register/list");

+ 2 - 1
src/main/webapp/common/admin/body_header.jsp

@@ -1,4 +1,5 @@
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
+<%@ page isELIgnored="false" %>
 <%
     String basePath = request.getContextPath();
 %>
@@ -11,7 +12,7 @@
         <ul class="nav navbar-top-links navbar-right">
             <li>
                 <a href="javascript:void(0)">
-                    <i class="fa fa-user"></i> admin
+                    <i class="fa fa-user"></i> ${sessionScope.loginUser.username}
                 </a>
             </li>
             <li>

+ 1 - 1
src/main/webapp/pages/admin/microapp/add.jsp

@@ -60,7 +60,7 @@
     </div>
     <div class="form-group">
         <label for="contact"><span style="color: red">*</span>需求用户</label>
-        <input type="text"  value="${sessionScope.userinfo}"readonly class="form-control" />
+        <input type="text"  value="${sessionScope.loginUser.username}"readonly class="form-control" />
         <span class="help-block"></span>
     </div>
     <div class="form-group">