|
|
@ -22,6 +22,7 @@ import com.epmet.service.evaluationindex.extract.todata.IssueExtractService; |
|
|
|
import com.epmet.service.topic.TopicService; |
|
|
|
import com.epmet.service.user.UserService; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
@ -129,7 +130,11 @@ public class IssueExtractServiceImpl implements IssueExtractService { |
|
|
|
agencyInfoList.forEach(pid -> { |
|
|
|
if (r.getAgencyId().equals(pid.getAgencyId())){ |
|
|
|
r.setPid(pid.getPid()); |
|
|
|
r.setPids(pid.getPids().concat(":").concat(r.getAgencyId())); |
|
|
|
if (StringUtils.isNotBlank(pid.getPids())) { |
|
|
|
r.setPids(pid.getPids().concat(":").concat(r.getAgencyId())); |
|
|
|
} else { |
|
|
|
r.setPids(r.getAgencyId()); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
@ -231,7 +236,11 @@ public class IssueExtractServiceImpl implements IssueExtractService { |
|
|
|
agencyInfoList.forEach(agency -> { |
|
|
|
if (r.getAgencyId().equals(agency.getAgencyId())){ |
|
|
|
r.setPid(agency.getPid()); |
|
|
|
r.setPids(agency.getPids().concat(":").concat(r.getAgencyId())); |
|
|
|
if(StringUtils.isNotBlank(agency.getPids())){ |
|
|
|
r.setPids(agency.getPids().concat(":").concat(r.getAgencyId())); |
|
|
|
}else{ |
|
|
|
r.setPids(r.getAgencyId()); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|