解决 普通用户看不到安检列表 问题

@@ -2399,9 +2399,6 @@ public class ManifestController extends BasicController {
 									}
 								}
 
-
-
-
 								// 用户ID
 								sd.setUSER_ID(userId);
 

@@ -35,10 +35,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Auther: shenhl
@@ -76,7 +73,7 @@ public class SecurityDeclarationController {
     @RequestMapping(value = "/grid.json")
     @ResponseBody
     public DataGrid<SecurityDeclarationVo> grid(HttpServletRequest request, EasyPage<SecurityManifestEntity> pageForm) {
-
+        try {
             Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
             UserEntity ue = (UserEntity)SecurityUtils.getSubject().getSession().getAttribute("user");
             pageForm.setSearchParams(searchParams);
@@ -85,7 +82,7 @@ public class SecurityDeclarationController {
 
                 if (Tools.getUserId() != null && Tools.getUserId() != 1){
                     // 不是管理员,添加用户id的条件
-                pageForm.getSearchParams().put("EQ_USER_ID", u);
+                    pageForm.getSearchParams().put("EQ_USERID", u);
                 }
             }
 
@@ -105,6 +102,7 @@ public class SecurityDeclarationController {
                     sdVo.setSd_transport_certificate(sd.getCertificate());
                     sdVo.setSd_transportation_prove(sd.getProve());
                     sdVo.setSd_iata_number(sd.getIata());
+                    sdVo.setUser_id(sd.getUSERID());
                     if("1".equals(sd.getStatics())){
                         sdVo.setSd_static("已发送安检申报报文");
                     }
@@ -117,6 +115,13 @@ public class SecurityDeclarationController {
             vos.setRows(rows);
             vos.setTotal(securityDeclarationEntityDataGrid.getTotal());
             return vos;
+
+        }catch (Exception e){
+            e.printStackTrace();
+            DataGrid<SecurityDeclarationVo> vos = new DataGrid<>();
+            return vos;
+        }
+
     }
 
 

@@ -30,7 +30,7 @@ public class SecurityManifestEntity extends IdEntity implements Serializable {
 
     private String prove;
 
-    private Long userid;
+    private Long USERID;
 
     private String operation;
 
@@ -104,12 +104,12 @@ public class SecurityManifestEntity extends IdEntity implements Serializable {
         this.prove = prove;
     }
 
-    public Long getUserid() {
-        return userid;
+    public Long getUSERID() {
+        return USERID;
     }
 
-    public void setUserid(Long userid) {
-        this.userid = userid;
+    public void setUSERID(Long USERID) {
+        this.USERID = USERID;
     }
 
     public String getOperation() {