Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao

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

@@ -130,7 +130,7 @@
 		b.instance_id=a.instance_id where a.unit_name is not null
 	</select>
 
-
+	<!--联动单位列表按时间倒叙排列add order by clu.rec_date desc 同时处理单位根节点-1时查询全部数据问题 2021-09-08 by kongfm -->
 	<select id="getEmergencyLinkageUnitList"
 		resultType="java.util.Map">
 		SELECT
@@ -189,12 +189,15 @@
 			AND clu.linkage_unit_type =#{linkageUnitType}
 		</if>
 		<if
-			test="emergencyLinkageUnitCode != null and emergencyLinkageUnitCode != ''">
-			AND clu.emergency_linkage_unit_code =#{emergencyLinkageUnitCode}
+			test="emergencyLinkageUnitCode != null and emergencyLinkageUnitCode != '' ">
+			<if test="emergencyLinkageUnitCode != '-1'">
+				AND clu.emergency_linkage_unit_code =#{emergencyLinkageUnitCode}
+			</if>
 		</if>
 		<if
 			test="linkageUnitTypeCode != null and linkageUnitTypeCode != ''">
 			AND clu.linkage_unit_type_code =#{linkageUnitTypeCode}
 		</if>
+		order by clu.rec_date desc
 	</select>
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireExpertsServiceImpl.java

@@ -30,7 +30,8 @@ public class FireExpertsServiceImpl extends BaseService<FireExpertsDto, FireExpe
                                                         @Condition(Operator.eq) Boolean isDelete,
                                                         @Condition(Operator.like) String name,
                                                         @Condition(Operator.eq) String expertCode) {
-        return this.queryForPage(page, null, false, isDelete, name, expertCode);
+        // 消防专家按时间倒叙排列add rec_date 2021-09-08 by kongfm
+        return this.queryForPage(page, "rec_date", false, isDelete, name, expertCode);
     }
 
     /**