项目立项报错

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/WeldMapper.xml

@@ -17,7 +17,7 @@
                 </if>
 
             </if>
-        <if test="codes !=null">
+        <if test="codes !=null and codes.size >0">
             AND  tz_ugp_weld.project_id IN
             <foreach collection="codes" item ="item" index="index" open="(" separator="," close=")">
                 #{item}

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java

@@ -106,9 +106,14 @@ public class ProjectController extends BaseController {
 		String date = new SimpleDateFormat("yyyy").format(new Date());
 		String code = "XM"+date+"-";
 		String format="";
+		String projectCode = "";
 		LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
 		wrapper.orderByDesc(Project::getCode);
-		String projectCode = projectServiceImpl.list(wrapper).iterator().next().getCode();
+		List<Project> list = projectServiceImpl.list(wrapper);
+		if(!ValidationUtil.isEmpty(list)){
+			projectCode =list.iterator().next().getCode();
+
+
 
 
 		if(!ValidationUtil.isEmpty(projectCode)){
@@ -120,7 +125,9 @@ public class ProjectController extends BaseController {
 				atomicNum.set(INIT_CODE_NUM);
 			}
 			format = String.format("%04d", atomicNum.incrementAndGet());
-
+		}
+		}else {
+			format = String.format("%04d", atomicNum.incrementAndGet());
 		}
 		return code+format;
 	}

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WelderController.java

@@ -173,14 +173,19 @@ public class WelderController extends BaseController {
         IPage companyWelder = orgServiceImpl.getCompanyWelder(page);
 
         List<Map> welderRecords = companyWelder.getRecords();
-
-        //模糊查询
-        if (name!=null||idNumber!=null||licensedProject!=null){
-            if (name!=null) {welderRecords = welderRecords.stream().filter(n -> ((String)n.get("name")).indexOf(name)>-1).collect(Collectors.toList());}
-            if (idNumber!=null) {welderRecords = welderRecords.stream().filter(n -> ((String)n.get("idNumber")).indexOf(idNumber)>-1).collect(Collectors.toList());}
-            if (licensedProject!=null) {welderRecords = welderRecords.stream().filter(n -> ((String)n.get("licensedProject")).indexOf(licensedProject)>-1).collect(Collectors.toList());}
+        try{
+            //模糊查询
+            if (name!=null||idNumber!=null||licensedProject!=null){
+                if (name!=null) {welderRecords = welderRecords.stream().filter(n -> ((String)n.get("name")).indexOf(name)>-1).collect(Collectors.toList());}
+                if (idNumber!=null) {welderRecords = welderRecords.stream().filter(n -> ((String)n.get("idNumber")).indexOf(idNumber)>-1).collect(Collectors.toList());}
+                if (licensedProject!=null) {welderRecords = welderRecords.stream().filter(n -> ((String)n.get("licensedProject")).indexOf(licensedProject)>-1).collect(Collectors.toList());}
+            }
+        }catch (Exception e){
+            e.getStackTrace();
+            System.out.println("数据库数据出错");
         }
 
+
         Page records = page.setRecords(welderRecords);
         return ResponseHelper.buildResponse(records);
     }