Browse Source

zaishishi

dev
yinzuomei 3 years ago
parent
commit
a093d3a0df
  1. 1
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
  2. 4
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml

1
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java

@ -127,6 +127,7 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
if(CollectionUtils.isEmpty(unitNames)){ if(CollectionUtils.isEmpty(unitNames)){
unitNames=icPartyUnitService.getUnitNames(unitIds); unitNames=icPartyUnitService.getUnitNames(unitIds);
} }
dto.setUnitIdList(unitIds);
dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA)); dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA));
if (StringUtils.isNotEmpty(dto.getGridId())) { if (StringUtils.isNotEmpty(dto.getGridId())) {
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());

4
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml

@ -232,8 +232,8 @@
ic_party_unit u ic_party_unit u
where 1=1 where 1=1
<trim prefix="AND ( " suffix=" )"> <trim prefix="AND ( " suffix=" )">
<foreach collection="unitIds" separator="or" item="i" index="index" > <foreach collection="unitIds" separator="or" item="id" index="index" >
ID = #{i.id} u.ID = #{id}
</foreach> </foreach>
</trim> </trim>
</select> </select>

Loading…
Cancel
Save