BJ_FS / urbanops

Commit 89fbee7cb4c0063ec26d037d697f1408759f01cd

Authored by 颜惠青
2 parents 4e3f41ef 322d4a01

Merge branch 'dev' 

# Conflicts:
#	urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/constant/BpmCommonConstant.java
Inline Side-by-side
Showing 1 changed file with 12 additions and 1 deletions
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java
  View file @89fbee7
... ... @@ -297,8 +297,19 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{
297 297  
298 298 @Override
299 299 public boolean isSanhai(Long companyId) {
  300 + List<DictDataRespDTO> dictData = dictDataCommonApi.getDictDataList(SANHAI_COMPANY);
  301 + if(null == dictData || dictData.size()==0){
  302 + throw exception(SANHAI_COMPANY_NOT_EXISTS);
  303 + }
300 304 List<Long> sanHaiRoadId = new ArrayList<>();
301   - sanHaiRoadId.add(115L); // TODO 目前写死
  305 + for(DictDataRespDTO dto:dictData){
  306 + try {
  307 + sanHaiRoadId.add(Long.parseLong(dto.getValue()));
  308 + }catch (Exception e){
  309 + throw exception(SANHAI_COMPANY_NOT_EXISTS);
  310 + }
  311 + }
  312 + //sanHaiRoadId.add(115L); // 目前写死 ,上面改为从字典值获取258
302 313 //是否三海路段
303 314 boolean isSanhai = sanHaiRoadId.contains(companyId);
304 315 return isSanhai;
... ...