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

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

@@ -35,10 +35,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.net.URL;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 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
  * @Auther: shenhl
@@ -76,47 +73,55 @@ public class SecurityDeclarationController {
     @RequestMapping(value = "/grid.json")
     @RequestMapping(value = "/grid.json")
     @ResponseBody
     @ResponseBody
     public DataGrid<SecurityDeclarationVo> grid(HttpServletRequest request, EasyPage<SecurityManifestEntity> pageForm) {
     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);
+            if (ue!=null){
+                Long u = ue.getId();
 
 
-        Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
-        UserEntity ue = (UserEntity)SecurityUtils.getSubject().getSession().getAttribute("user");
-        pageForm.setSearchParams(searchParams);
-        if (ue!=null){
-            Long u = ue.getId();
-
-            if (Tools.getUserId() != null && Tools.getUserId() != 1){
-                // 不是管理员,添加用户id的条件
-                pageForm.getSearchParams().put("EQ_USER_ID", u);
+                if (Tools.getUserId() != null && Tools.getUserId() != 1){
+                    // 不是管理员,添加用户id的条件
+                    pageForm.getSearchParams().put("EQ_USERID", u);
+                }
             }
             }
-        }
-
-        pageForm.parseData(securityDeclarationService.getPage(pageForm));
 
 
-        DataGrid<SecurityManifestEntity> securityDeclarationEntityDataGrid = pageForm.getData();
-
-        List<SecurityDeclarationVo>rows = new ArrayList<>();
-
-        if (CollectionUtils.isNotEmpty(securityDeclarationEntityDataGrid.getRows())){
-            for (SecurityManifestEntity sd: securityDeclarationEntityDataGrid.getRows()){
-                SecurityDeclarationVo sdVo = new SecurityDeclarationVo();
-                sdVo.setId(sd.getId());
-                sdVo.setSd_waybill(sd.getWaybill());
-                sdVo.setSd_cargo_shipper_name(sd.getShippername());
-                sdVo.setSd_cargo_agent_name(sd.getAgentname());
-                sdVo.setSd_transport_certificate(sd.getCertificate());
-                sdVo.setSd_transportation_prove(sd.getProve());
-                sdVo.setSd_iata_number(sd.getIata());
-                if("1".equals(sd.getStatics())){
-                    sdVo.setSd_static("已发送安检申报报文");
+            pageForm.parseData(securityDeclarationService.getPage(pageForm));
+
+            DataGrid<SecurityManifestEntity> securityDeclarationEntityDataGrid = pageForm.getData();
+
+            List<SecurityDeclarationVo>rows = new ArrayList<>();
+
+            if (CollectionUtils.isNotEmpty(securityDeclarationEntityDataGrid.getRows())){
+                for (SecurityManifestEntity sd: securityDeclarationEntityDataGrid.getRows()){
+                    SecurityDeclarationVo sdVo = new SecurityDeclarationVo();
+                    sdVo.setId(sd.getId());
+                    sdVo.setSd_waybill(sd.getWaybill());
+                    sdVo.setSd_cargo_shipper_name(sd.getShippername());
+                    sdVo.setSd_cargo_agent_name(sd.getAgentname());
+                    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("已发送安检申报报文");
+                    }
+                    sdVo.setOperation(sd.getOperation());
+                    sdVo.setCustoms(sd.getCustoms());
+                    rows.add(sdVo);
                 }
                 }
-                sdVo.setOperation(sd.getOperation());
-                sdVo.setCustoms(sd.getCustoms());
-                rows.add(sdVo);
             }
             }
+            DataGrid<SecurityDeclarationVo> vos = new DataGrid<>();
+            vos.setRows(rows);
+            vos.setTotal(securityDeclarationEntityDataGrid.getTotal());
+            return vos;
+
+        }catch (Exception e){
+            e.printStackTrace();
+            DataGrid<SecurityDeclarationVo> vos = new DataGrid<>();
+            return vos;
         }
         }
-        DataGrid<SecurityDeclarationVo> vos = new DataGrid<>();
-        vos.setRows(rows);
-        vos.setTotal(securityDeclarationEntityDataGrid.getTotal());
-        return vos;
+
     }
     }
 
 
 
 

@@ -30,7 +30,7 @@ public class SecurityManifestEntity extends IdEntity implements Serializable {
 
 
     private String prove;
     private String prove;
 
 
-    private Long userid;
+    private Long USERID;
 
 
     private String operation;
     private String operation;
 
 
@@ -104,12 +104,12 @@ public class SecurityManifestEntity extends IdEntity implements Serializable {
         this.prove = prove;
         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() {
     public String getOperation() {