Commit ce7f75b1 by 高晓磊

集团用户获取不到最新砂价的bug

parent 2536052c
......@@ -98,20 +98,19 @@ public class PriceAdjustmentServiceImpl implements PriceAdjustmentService {
@Override
public List<KObject> getNewsByRegionalCompanyIds(UUID currentRegionalCompanyId) {
ArrayList<UUID> regionalCompanyIds = null;
List<UUID> ids = new ArrayList<>();
if (null != currentRegionalCompanyId) {
regionalCompanyIds = new ArrayList<>();
regionalCompanyIds.add(currentRegionalCompanyId);
}
List<KObject> kObjects = regionalCompanyPriceAuthorityService.listAllCheck(regionalCompanyIds);
List<UUID> ids = new ArrayList<>();
if (!CollectionUtils.isEmpty(kObjects)) {
for (KObject kObject : kObjects) {
ids.add(kObject.get("canLookRegionalCompany").getUuid("id"));
List<KObject> kObjects = regionalCompanyPriceAuthorityService.listAllCheck(regionalCompanyIds);
if (!CollectionUtils.isEmpty(kObjects)) {
for (KObject kObject : kObjects) {
ids.add(kObject.get("canLookRegionalCompany").getUuid("id"));
}
}
}
if(null!=currentRegionalCompanyId){
ids.add(currentRegionalCompanyId);
}
return priceAdjustmentDao.getNewsByRegionalCompanyIds(ids);
}
......
......@@ -19,14 +19,14 @@ public class PriceAdjustmentStatusTask implements Task {
@Override
public void execute(TaskContext taskContext) {
logger.info("开始修改采砂许可证状态");
logger.info("开始修改砂石类型价格生效状态");
if(priceAdjustmentService ==null){
priceAdjustmentService = Amino.getApplicationContext().getBean(PriceAdjustmentService.class);
}
priceAdjustmentService.updatePriceAdjustmentStatus();
logger.info("修改采砂许可证状态结束");
logger.info("修改砂石类型价格生效结束");
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment