1.三库建设大屏接口自测

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/ZLStatisticsMapper.xml

@@ -171,6 +171,7 @@
 			tui.unit_code =  bi.use_code
 			and ((bi.supervise_org_code != '50' and bi.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (bi.supervise_org_code = '50' and bi.office_region LIKE CONCAT ('%', #{regionCode}, '%')))
 			and tui.is_delete=false
+		    and bi.is_delete= '0'
 		    group by keyStr
 	</select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/JGDPStatisticsController.java

@@ -610,7 +610,7 @@ public class JGDPStatisticsController {
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "POST", value = "大屏总览-右侧-三库建设情况统计", notes = "大屏总览-右侧-三库建设情况统计")
+    @ApiOperation(httpMethod = "POST", value = "大屏总览-右侧-三库建设情况统计（柱状图）", notes = "大屏总览-右侧-三库建设情况统计（柱状图）")
     @PostMapping(value = "/zl/skjs")
     public ResponseModel<Map<String, Object>> queryBarChartDataForSkjs(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -299,6 +299,7 @@
 			"tz_base_enterprise_info" a
 		where
 		   ((a.supervise_org_code != '50' and a.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (a.supervise_org_code = '50' and a.office_region LIKE CONCAT ('%', #{cityCode}, '%')))
+		   and a.is_delete = '0'
 		   group by a.unit_type
 	</select>
 	<select id="countByUnitTypeAndOrgCodeNoParam" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">