20191114

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/service/ErpCreditService.java

@@ -254,7 +254,6 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
             itemIdList.add(erpCredit.getItemId());
         }
         List<MaintainData> maintainDatas =getFindListMain(itemIdList);//维护数据集合
-//        System.out.println(maintainDatas.size()+"维护数据长度");
         List<Information> informationList = informationService.findNoFinishList(itemIdList);
         if (null!=informationList&&informationList.size()>0){
             sortList = new ArrayList<String>();
@@ -291,7 +290,10 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
             sortList2 = new ArrayList<String>();
             for (MaintainData maintainData:maintainDatas){
                for (String str3:itemIdList){
-                   sortList.add(str3);//有数据
+                   if (maintainData.getProjectId().equals(str3)){
+                       sortList.add(str3);//有数据
+                       break;
+                   }
                }
             }
             for(Map.Entry<String, String> entry : map.entrySet()){
@@ -316,6 +318,8 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
                     i--;
                 }
             }
+        }else {
+            lists=null;
         }
         return lists;
     }

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/web/ErpCreditController.java

@@ -157,9 +157,9 @@ public class ErpCreditController extends BaseController {
 	public AjaxJson exportFile(String ids, HttpServletRequest request, HttpServletResponse response){
 		AjaxJson j = new AjaxJson();
 		List<String> strings = erpCreditService.getCheck(ids);
-		if (null==strings&&strings.size()==0){
+		if (null==strings||strings.size()==0){
 			j.setSuccess(false);
-			j.setMsg("导出失败！失败信："+"不符合条件");
+			j.setMsg("导出失败！失败信息："+"不符合条件");
 			return j;
 		}
 		try {