Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/service/PriceAdjustmentServiceImpl.java

@@ -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);
     }

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/task/PriceAdjustmentStatusTask.java

@@ -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("修改砂石类型价格生效结束");
 
     }
 }