1.自测发现的大屏检验检测人员数据过滤问题bug修改

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

@@ -100,7 +100,7 @@
                     (supervise_org_code != '50' and supervise_org_code LIKE CONCAT (#{orgCode}, '%'))
                 </foreach>
                 <if test="tzBaseEnterpriseInfoDto.cityCode!=null and tzBaseEnterpriseInfoDto.cityCode!='' ">
-                    or (a.supervise_org_code = '50' and a.office_region LIKE CONCAT ('%',
+                    or (supervise_org_code = '50' and office_region LIKE CONCAT ('%',
                     #{tzBaseEnterpriseInfoDto.cityCode}, '%'))
                 </if>
                 )

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

@@ -123,6 +123,7 @@
 		LEFT JOIN tz_base_enterprise_info bei ON tui.unit_code = bei.use_code
 		where
 			tui.is_delete = '0'
+		    and bei.is_delete = '0'
 		<if test="unitTypeList != null and unitTypeList.size() > 0">
 			AND
 			<foreach collection="unitTypeList" item="unitType" open="(" separator="OR" close=")">
@@ -130,7 +131,7 @@
 			</foreach>
 		</if>
 		<if test="orgCode != null and orgCode != ''">
-			AND bei.supervise_org_code LIKE concat ( '%', #{orgCode}, '%' )
+			and ((bei.supervise_org_code != '50' and bei.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (bei.supervise_org_code = '50' and bei.office_region LIKE CONCAT ('%', #{paramDto.cityCode}, '%')))
 		</if>
 		<if test="paramDto.name != null and paramDto.name != ''">
 			AND tui.name LIKE concat ( '%', #{paramDto.name}, '%' )

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

@@ -1150,6 +1150,9 @@ public class ZLDPStatisticsServiceImpl {
     public Page<Map<String,Object>> getPersonPage(DPFilterParamDto paramDto, Page page) {
         String regionCode = paramDto.getCityCode();
         String orgCode = stCommonService.getAndSetOrgCode(regionCode);
+        if(StringUtils.isEmpty(orgCode)){
+            return new Page<>();
+        }
         List<String> unitTypeList = UnitTypeEnum.getNameListByType(paramDto.getCompanyType());
         Page<Map<String, Object>> result = screenMapper.getPersonPage(page, paramDto, orgCode, unitTypeList);
         List<EquipmentCategoryDto> equipmentCategoryDtos = equipmentCategoryMapper.selectClassify();