Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/yxproject/start/api/UserApi.java

@@ -191,7 +191,6 @@ public class UserApi {
     @RequiresPermissions("userInfo.add")//权限管理;
     @ResponseBody
     public String addQuickCyclesheetInfo(@RequestParam("id") String id, HttpServletResponse resp) {
-
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
         int i = taskService.addQuickCyclesheetInfo(id);
@@ -547,10 +546,10 @@ public class UserApi {
         JSONObject jsonObject = JSONObject.fromObject(idNo);
         Map<String, List> jsonArray1 = (Map<String, List>)jsonObject;
         List list = jsonArray1.get("list");
-        List<ProdCardEntity> taskEntity =  prodCardService.getProdCard(list);
+        List<ProdCardEntity> prodCardEntity =  prodCardService.getProdCard(list);
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
-        yxjsonResponse.outPutSuccess(taskEntity);
+        yxjsonResponse.outPutSuccess(prodCardEntity);
         Map map = new HashMap();
         return yxjsonResponse.toJSONString();
     }

src/main/java/com/yxproject/start/entity/ProdCardEntity.java

@@ -45,7 +45,7 @@ public class ProdCardEntity {
     }
 
     @Basic
-    @Column(name = "specialType", nullable = false, precision = 0)
+    @Column(name = "specialType", nullable = true, precision = 0)
     public long getSpecialType() {
         return specialType;
     }

src/main/java/com/yxproject/start/service/impl/ProdCardServiceImpl.java

@@ -6,10 +6,7 @@ import com.yxproject.start.service.ProdCardService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by Administrator on 2018/12/26.
@@ -29,6 +26,20 @@ public class ProdCardServiceImpl implements ProdCardService {
         List list = new ArrayList<>();
         for (int i=0; i <idNo.size(); i++) {
             List <ProdCardEntity> prodCardEntity = specialCardMapper.getProdCard((String) idNo.get(i));
+            if(prodCardEntity.size() == 0){
+                ProdCardEntity prodCardEntity1 = new ProdCardEntity() ;
+                prodCardEntity1.setName("信息有误");
+                if(((String) idNo.get(i)).length() == 10){
+                    prodCardEntity1.setAcceptNo((String) idNo.get(i));
+                    prodCardEntity1.setIdNo(null);
+                  }
+                else{
+                    prodCardEntity1.setAcceptNo(null);
+                    prodCardEntity1.setIdNo((String) idNo.get(i));
+                }
+                list.add(prodCardEntity1);
+            }
+
             list.addAll(prodCardEntity);
         }
 //        去重