|
|
@ -55,7 +55,10 @@ import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
|
import java.util.*; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Arrays; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
import static java.util.stream.Collectors.toList; |
|
|
|
|
|
|
@ -242,7 +245,7 @@ public class PoliceServiceImpl extends BaseServiceImpl<PoliceDao, PoliceEntity> |
|
|
|
ConvertUtils.sourceToTarget(parentAndAllDeptDTO, DeptEntityUtils.DeptDto.class), |
|
|
|
entity |
|
|
|
); |
|
|
|
//
|
|
|
|
// 查询民警使用的gridID是最末级,而警民群保存的是其父级gridID,需要用最末级的parentID,来匹配警民群的AllID。
|
|
|
|
policeResultDTO.setPoliceList(baseDao.selectPoliceInfo(entity)); |
|
|
|
} |
|
|
|
return policeResultDTO; |
|
|
|