修改bug

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

@@ -13,7 +13,7 @@
     <select id="getFirefighters"
             resultType="com.yeejoin.amos.boot.module.common.api.entity.Firefighters">
         select a.* from cb_firefighters a LEFT JOIN cb_firefighters_post b on
-        a.sequence_nbr=b.firefighters_id where a.is_delete=0 ORDER BY a.rec_date DESC
+        a.sequence_nbr=b.firefighters_id where a.is_delete=0 ORDER BY a.rec_date 
         <if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
         <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}"</if>
         <if test='par.name!=null'>and a.name= #{par.name}</if>
@@ -26,7 +26,7 @@
     <select id="getFirefightersCount" resultType="Map">
         select COUNT(a.sequence_nbr) num from cb_firefighters a LEFT JOIN
         cb_firefighters_post b on a.sequence_nbr=b.firefighters_id where
-        a.is_delete=0 ORDER BY a.rec_date DESC
+        a.is_delete=0 ORDER BY a.rec_date 
         <if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
         <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}"</if>
         <if test='par.name!=null'>and a.name= #{par.name}</if>

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -118,7 +118,7 @@ public class FirefightersController extends BaseController {
         queryWrapper.eq("firefighters_id", id);
         queryWrapper.eq("is_delete", 0);
         List<FirefightersJacket> firefightersJacket = iFirefightersJacketService.list(queryWrapper);
-        if (firefightersJacket != null) {
+        if (firefightersJacket != null&&firefightersJacket.size()>0) {
             throw new RuntimeException("该消防还有在装装备！");
         }
         try {