bug fix

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/mapper/other/EnforceObjArchitectureRelateMapper.java

@@ -26,5 +26,5 @@ public interface EnforceObjArchitectureRelateMapper extends BaseMapper<EnforceOb
 
     List<EnforceJobObjDTO> getEnforceJobList(@Param("enforceObjIds")List<String> enforceObjIds);
 
-    List<EnforceObjChangeArchitectureDTO> getEnforceObjChangeArchitectureDTOList(@Param("enforceObjIds")List<String> enforceObjIds);
+    List<EnforceObjChangeArchitectureDTO> getEnforceObjChangeArchitectureDTOList(@Param("enforceObjIds")List<String> enforceObjIds,@Param("uuid")String uuid);
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/other/EnforceObjArchitectureRelateServiceImpl.java

@@ -113,7 +113,7 @@ public class EnforceObjArchitectureRelateServiceImpl extends ServiceImpl<Enforce
             if (CollectionUtils.isNotEmpty(enforceJobObjDTOS)) {
                 Map<String, List<EnforceJobObjDTO>> jobMap = enforceJobObjDTOS.stream().collect(Collectors.groupingBy(EnforceJobObjDTO::getEnforceObjId));
                 //单位变更记录列表
-                List<EnforceObjChangeArchitectureDTO> hisList = enforceObjArchitectureRelateMapper.getEnforceObjChangeArchitectureDTOList(enforceObjIds);
+                List<EnforceObjChangeArchitectureDTO> hisList = enforceObjArchitectureRelateMapper.getEnforceObjChangeArchitectureDTOList(enforceObjIds,query.getArchitectureUuid());
                 Map<String, List<EnforceObjChangeArchitectureDTO>> hisMap = hisList.stream().collect(Collectors.groupingBy(EnforceObjChangeArchitectureDTO::getEnforceObjId));
                 List<String> chekckIdsList = new ArrayList<>();
                 list.forEach(e->{

zfjg-modules/zfjg-manage/src/main/resources/mapper/other/EnforceObjArchitectureRelateMapper.xml

@@ -34,7 +34,7 @@
          job_type in ('NORMAL','SPECIAL','REPORT','REVIEW','BRIGADE','OTHER')
          and enforce_obj_id in
         <foreach collection="enforceObjIds" item="enforceObjId" open="(" separator="," close=")">
-            #{enforceObjIds}
+            #{enforceObjId}
         </foreach>
 
     </select>
@@ -42,12 +42,12 @@
 <!--    查询单位的所有变更记录-->
     <select id="getEnforceObjChangeArchitectureDTOList" resultType="com.zfjg.manage.api.dto.other.EnforceObjChangeArchitectureDTO">
         select   enforce_obj_id,create_time,before_architecture_uuid,after_architecture_uuid from enforce_obj_architecture_relate_his
-        where before_architecture_id!=after_architecture_id
+        where (before_architecture_id is  null or before_architecture_id!=after_architecture_id )
         and (before_architecture_uuid =#{uuid} or after_architecture_uuid = #{uuid})
         and enforce_obj_id in
         <foreach collection="enforceObjIds" item="enforceObjId" open="(" separator="," close=")">
-            #{enforceObjIds}
+            #{enforceObjId}
         </foreach>
-        order by create_time desc
+        order by create_time asc
     </select>
 </mapper>