修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/LinkageUnitMapper.xml

@@ -112,6 +112,7 @@
 	linkageUnitTypeCode,
 	a.emergency_linkage_unit_code
 	emergencyLinkageUnitCode,
+	emergency_linkage_unit,
 	a.address ,
 	a.latitude,
 	a.longitude,

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -328,12 +328,14 @@ public class ExcelServiceImpl {
 
 			List<Map<String, Object>> pageList = dynamicFormInstanceService.listAll("linkageUnit");
 			linkageUnitListMap.forEach(i -> {
-				String mainString = i.get("instanceId").toString();
-				pageList.stream().forEach(detail -> {
-					if (detail.get("instanceId").toString().equals(mainString)) {
-						i.putAll(detail);
-					}
-				});
+				if ( i.get("instanceId") != null){
+					String mainString = i.get("instanceId").toString();
+					pageList.stream().forEach(detail -> {
+						if (detail.get("instanceId").toString().equals(mainString)) {
+							i.putAll(detail);
+						}
+					});
+				}
 			});
 			List<LinkageUnitDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(linkageUnitListMap),
 					LinkageUnitDto.class);

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -1991,15 +1991,24 @@
     </changeSet>
 
 
-<!--    <changeSet author="tw" id="2021-11-01-1">-->
-<!--        <preConditions onFail="MARK_RAN">-->
-<!--            <tableExists tableName="jc_alert_called"/>-->
-<!--        </preConditions>-->
-<!--        <comment>增加备注字段</comment>-->
-<!--        <sql>-->
-<!--            ALTER TABLE jc_alert_called ADD remark varchar(10000)  NULL COMMENT '备注'-->
-<!--        </sql>-->
-<!--    </changeSet>-->
+    <changeSet author="chenzhao" id="2021-11-02-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="jc_template"/>
+        </preConditions>
+        <comment>update data jc_template</comment>
+        <sql>
+            UPDATE `jc_template` SET content ='【120急救】时间：callTime；地址：address；被困人数：trappedNum；伤亡人数：casualtiesNum；性别：gender；年龄段(岁)：ageGroup；患者现状：patientStatus；情况说明：situation；警情阶段：alertStage' WHERE sequence_nbr=23;
+        </sql>
+    </changeSet>
+    <!--    <changeSet author="tw" id="2021-11-01-1">-->
+    <!--        <preConditions onFail="MARK_RAN">-->
+    <!--            <tableExists tableName="jc_alert_called"/>-->
+    <!--        </preConditions>-->
+    <!--        <comment>增加备注字段</comment>-->
+    <!--        <sql>-->
+    <!--            ALTER TABLE jc_alert_called ADD remark varchar(10000)  NULL COMMENT '备注'-->
+    <!--        </sql>-->
+    <!--    </changeSet>-->
 
         </databaseChangeLog>