Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentCountSummaryMapper.java

@@ -25,7 +25,7 @@ public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSu
                              @Param("year")Integer year,
                              @Param("typeParentId")String typeParentId,
                              @Param("monthList") List<Integer> monthList);
-    List<TjOrgCountDto>  TjOrgCount1(@Param("orgIdList") List<String> orgId,
+    List<TjOrgCountDto>  TjOrgCount1(@Param("orgId") String orgId,
                                     @Param("typeIdsList") List<String> typeIdsList,
                                     @Param("sizeNameList") List<String> sizeNameList,
                                     @Param("year")Integer year,

jyzb-biz/src/main/resources/mapper/EquipmentCountSummaryMapper.xml

@@ -145,7 +145,6 @@
     </select>
 
     <select id="TjOrgCount1" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto"  >
-        <foreach collection="orgIdList" item="orgId" separator="UNION ALL">
             SELECT
             MAX(vecs.org_id) as org_id,
             MAX(vecs.org_code) as org_code,
@@ -184,7 +183,6 @@
                 </foreach>
             </if>
             GROUP BY `year`, month
-        </foreach>
 
     </select>
     <select id="TjOrgCountSum" resultType="com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgCountDto">