代码整合

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesHistorydataMapper.xml

@@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             import_uuid = #{importUuid}
             <if test="templateId != null "> and template_id = #{templateId}</if>
-            <if test="roleId != null and identifyingCode == 0"> and role_id = #{roleId}</if>
+            <if test="roleId != null and roleId == 0"> and role_id = #{roleId}</if>
             <if test="identifyingCode != null "> and identifying_code = #{identifyingCode}</if>
         </where>
     </update>

ruoyi-ui/src/views/system/supplies/index.vue

@@ -1769,6 +1769,7 @@ export default {
                         let jsonDataa = JSON.parse(data[i].historyContent);
                         for (let j = 0; j < jsonDataa.length; j++) {
                             let  dataa=window.luckysheet.transToData(jsonDataa[j].celldata);
+                            debugger
                             for (let k = 2; k < dataa.length; k++) {
                                 if(dataa[k][1] == null){
                                     continue;
@@ -1967,6 +1968,7 @@ export default {
                                     }
                                 }
                                 let b16 ;
+
                                 if(datab[w][15] != null){
                                     b16= datab[w][15].v;
                                     if(b16 == undefined){