fix(ymt/统计):人员统计bug

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

@@ -34,7 +34,8 @@
 					INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( subquery.org_code, '%' )
 					INNER JOIN tzs_user_info tui ON bi.use_code = tui.unit_code
 		WHERE
-			tui.post LIKE concat ( '%', '6552', '%' )
+			tui.new_post LIKE concat ( '%', '6552', '%' )
+		  AND tui.is_delete = 'f'
 		  AND bi.unit_type IS NOT NULL
 	</select>
 	<select id="supervisorCount" resultType="java.util.Map">
@@ -54,14 +55,14 @@
 	</select>
 	<select id="userCountNew" resultType="java.util.Map">
 		SELECT
-			tui.post
+			tui.new_post
 		FROM
 			( SELECT org_code FROM privilege_company WHERE company_code = #{screenDto.cityCode} ) AS subquery
 				INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( subquery.org_code, '%' )
 				INNER JOIN tzs_user_info tui ON bi.use_code = tui.unit_code
 		WHERE
 		  bi.unit_type IS NOT NULL
-		  AND tui.post IS NOT NULL
+		  AND tui.new_post IS NOT NULL
 		  AND tui.is_delete = 'f'
 		  <if test="unitTypeList != null and unitTypeList.size() > 0">
 			AND

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

@@ -56,7 +56,7 @@
              tz_base_enterprise_info bi
         WHERE
             tui.unit_code =  bi.use_code
-            and tui.post LIKE concat ('%', #{post}, '%')
+            and tui.new_post LIKE concat ('%', #{post}, '%')
             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
     </select>