维修

platform-dao/src/main/resources/mapper/sb/SbUpdateLogMapper.xml

@@ -9,7 +9,7 @@
         from t_sb_update_log as log left join t_sb_info info
         on log.sb_id = info.id
         left join t_sb_type type on type.id = info.type_id
-        left join t_sb_position position on position.id = info.position
+        left join t_sb_position position on position.id = info.position_id
         left join t_sb_guige guige on guige.id = info.guige_id
         <where>
             <if test="sbId!=null and sbId!=''">

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -1573,7 +1573,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                         weekendCriteria.andEqualTo(CustomFieldTemplateData::getCreatedUserId,repairApplicationForm.getRepairUserId());
                     }
                     List<CustomFieldTemplateData> listCustomer = customFieldTemplateDataMapper.selectByExample(weekend);
-                    if(list != null || list.size() > 0){
+                    if(listCustomer != null && listCustomer.size() > 0){
                         RepairRecordTemplateData dataInfo = JsonUtils.jsonToModel(listCustomer.get(0).getData(),RepairRecordTemplateData.class);
                         repairApplicationForm.setOtherChangeContent(dataInfo.getRemark());
                     }