修改bug 2933 、 2929

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireExpertsDto.java

@@ -107,11 +107,13 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "消防专家领域code")
     private String expertCode;
 
-    @ExcelProperty(value = "人员照片", index = 16)
+   // @ExcelProperty(value = "人员照片", index = 16)
+    @ExcelIgnore
     @ApiModelProperty(value = "人员照片")
     private String personnelPhotos;
 
-    @ExcelProperty(value = "资质证书", index = 17)
+  //  @ExcelProperty(value = "资质证书", index = 17)
+    @ExcelIgnore
     @ApiModelProperty(value = "资质证书")
     private String qualificationCertificate;
 
@@ -131,7 +133,7 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "消防机构name")
     private Long fireTeamName;
 
-    @ExcelProperty(value = "备注", index = 18)
+    @ExcelProperty(value = "备注", index = 16)
     @ApiModelProperty(value = "备注")
     private String note;
 

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

@@ -127,7 +127,7 @@
 		cb_dynamic_form_instance m GROUP BY m.instance_id) b
 
 		on
-		b.instance_id=a.instance_id where a.unit_name is not null
+		b.instance_id=a.instance_id where a.unit_name is not null and a.is_delete=0
 	</select>
 
 	<!--联动单位列表按时间倒叙排列add order by clu.rec_date desc 同时处理单位根节点-1时查询全部数据问题 2021-09-08 by kongfm -->