修改条件评估论证bug

resources/mapper/modules/verify/CondationDao.xml

@@ -121,6 +121,7 @@
         from foc_verify_condition
         where depart_id=#{departId}
         and verif_id=#{verifId}
+        and `condition` is not null
     </select>
 
     <select id="getConditionVerifyDetails" resultType="com.ejweb.modules.verify.data.ConditionVerifyDetailData">
@@ -135,6 +136,7 @@
         left join foc_condition_feedback f on v.id=f.condition_id
         where v.depart_id=#{departId}
         and v.verif_id=#{verifId}
+        and v.`condition` is not null
         group by v.id
     </select>
 

src/com/ejweb/modules/route/api/RouteVerifyController.java

@@ -291,14 +291,10 @@ public class RouteVerifyController {
     @ResponseBody
     @RequestMapping(value = "/export")
     public void export(RequestBean requestBean, HttpServletResponse response) {
-
-        /* PageEntity<AirlineVerifyEntity> list = null;*/
         AirlineVerifyBean bean = requestBean.getObjectBean(AirlineVerifyBean.class);
         String message = airlineVerifyService.validate(bean);
-        if (message == null) {// 通过参数校验
-           /* list = airlineVerifyService.getRiskAssessmentListForExcel(bean);
-            List<AirlineVerifyEntity> list1=  list.getList();
-            if(list1==null)list1=new ArrayList<AirlineVerifyEntity>();*/
+        if (message == null) {
+            // 通过参数校验
             bean.setPageNo(1);
             bean.setPageSize(10000);
             PageEntity<AirlineVerifyEntity> page = airlineVerifyService.getRiskAssessmentList(bean);
@@ -310,12 +306,8 @@ public class RouteVerifyController {
                 new ExportExcel("待论证航线列表", AirlineVerifyEntity.class).setDataList(list).write(response, fileName).dispose();
             } catch (IOException e) {
                 e.printStackTrace();
-
-                /*return ;*/
             }
-            /* return ;*/
         }
     }
-    /* return ;*/
 }