调整

src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/DonorMaterialMapper.java

@@ -92,7 +92,7 @@ public interface DonorMaterialMapper extends BaseMapper<DonorMaterial> {
      * @param describe 物料描述
      * @return 判断项目是否存在
      */
-    DonorMaterial findDonor(@Param("projectId") String projectId,@Param("describe") String describe);
+    int findDonor(@Param("projectId") String projectId,@Param("describe") String describe);
 
     /**
      * 更新项目的erp数量

src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/xml/DonorMaterialMapper.xml

@@ -258,7 +258,7 @@
 	</update>
 
 	<select id="findDonor" resultType="com.jeeplus.modules.sg.financial.settlement.entity.DonorMaterial">
-		select id from finance_project_donor_material
+		select count(id) from finance_project_donor_material
 		where materail_describe = #{describe}
 		and project_id = #{projectId}
 	</select>

src/main/java/com/jeeplus/modules/sg/financial/settlement/service/DonorMaterialService.java

@@ -293,8 +293,8 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
             for (ErpCreditMaterial material : list) {
                 String eqmMaterialDetails2 = material.getEqmMaterialDetails2();
                 //通过设备物料描述，项目定义号，查询物料是否存在，存在更新，不存在插入
-                DonorMaterial donor = donorMaterialMapper.findDonor(projectId, eqmMaterialDetails2);
-                if (null == donor) {
+                int donor = donorMaterialMapper.findDonor(projectId, eqmMaterialDetails2);
+                if (donor <= 0) {
                     //插入
                     material.preInsert();
                     donorMaterialMapper.insertErpOne(material);