bug fix

ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BKeyEnterpriseServiceImpl.java

@@ -36,7 +36,9 @@ public class BKeyEnterpriseServiceImpl extends ServiceImpl<BKeyEnterpriseMapper,
             for (BKeyEnterprise bKeyEnterprise : bKeyEnterpriseList) {
                 //根据entcode获取行政区划代码
                 String entCode = bKeyEnterprise.getEntCode();
-                bKeyEnterprise.setDistrict(iSzEntBasicInfoService.getDistrict(entCode));
+                if (entCode!=null){
+                    bKeyEnterprise.setDistrict(iSzEntBasicInfoService.getDistrict(entCode));
+                }
                 baseMapper.bKeyEnterpriseAdd(bKeyEnterprise);
             }
             successMsg.append("导入成功");

ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml

@@ -11,11 +11,13 @@
             <if test="entCode != null">ent_code,</if>
             <if test="year != null">year,</if>
             <if test="enterpriseName != null">enterprise_name,</if>
+            <if test="district!= null">district,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="entCode != null">#{entCode},</if>
             <if test="year != null">#{year},</if>
             <if test="enterpriseName != null">#{enterpriseName},</if>
+            <if test="district != null">#{district},</if>
         </trim>
 
     </insert>

ruoyi-system/src/main/resources/mapper/yingji/SzEntBasicInfoMapper.xml

@@ -346,7 +346,7 @@
     </select>
     <select id="getDistrict" resultType="java.lang.String">
         SELECT SUBDISTRICT
-        FROM `sz_ent_basic_info_new a`
+        FROM sz_ent_basic_info_new
         where USC_CODE = #{entCode}
     </select>