1

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/provider/ConstructTeamProvider.java

@@ -14,7 +14,7 @@ public class ConstructTeamProvider {
                 " INSERT INTO pdm_construct_team(county_org_nm,team_no,team_nm,legal_person,legal_contact_phone,team_serial_no,team_leader,team_leader_phone,construc_car_number,arrest_point,create_by,create_time) VALUES ");
         for (int i =0; i < list.size(); i++) {
             PdmConstructTeamVo constructTeam = list.get(i);
-            sqlList.append(" (").append("'").append(constructTeam.getCountyOrgNm()).append("',")
+            sqlList.append(" (").append("'").append(constructTeam.getCountyOrgNm()==null?"":constructTeam.getCountyOrgNm()).append("',")
                     .append("'").append(constructTeam.getTeamNo()).append("',")
                     .append("'").append(constructTeam.getTeamNm()).append("',")
                     .append("'").append(constructTeam.getLegalPerson()).append("',")

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmConstructTeamServiceImpl.java

@@ -161,7 +161,6 @@ public class PdmConstructTeamServiceImpl implements IPdmConstructTeamService
                 PdmConstructTeamVo constructTeamVo=data.get(key);
                 constructTeamVo.getConstructorList().add(constructor);
             }else{
-
                 PdmConstructTeamVo constructTeamVo=new PdmConstructTeamVo();
                 BeanUtils.copyProperties(constructTeam,constructTeamVo);
                 if(StringUtils.isNotEmpty(constructTeam.getCarNumber())){

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmVehicleAlarmMapper.xml

@@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         1 = 1
         AND n <= ( LENGTH( construc_car_number ) - LENGTH( REPLACE ( construc_car_number, ',', '' ) ) + 1 )
         ORDER BY
-        id)a where 1=1 and   not EXISTS(select 1 from pdm_vehicle_alarm p where p.vehicle_no =a.vchicle_no
+        id)a where 1=1 and   IFNULL(vchicle_no,'')!='' and not EXISTS(select 1 from pdm_vehicle_alarm p where p.vehicle_no =a.vchicle_no
         and p.curator=a.team_leader and p.vehicle_group=a.team_nm
         )
     </insert>