pom.xml
@@ -60,6 +60,19 @@ </dependencyManagement> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-autoconfigure</artifactId> <version>2.7.12</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> <version>5.3.26</version> </dependency> <!-- Blade --> <dependency> <groupId>org.springblade</groupId> @@ -353,6 +366,13 @@ <version>23.1</version> </dependency> <!-- <dependency>--> <!-- <groupId>org.springframework.boot</groupId>--> <!-- <artifactId>spring-boot</artifactId>--> <!-- <version>2.7.12</version>--> <!-- </dependency>--> </dependencies> src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java
@@ -183,11 +183,16 @@ @GetMapping("/synchronousData") @ApiOperationSupport(order = 8) @ApiOperation(value = "信息同步") @ApiOperation(value = "E呼基本信息入录同步到新E呼即办") public void synchronousData() { IECallEventService bean = SpringUtils.getBean(IECallEventService.class); List<ECallEventEntity> list = bean.list(Wrappers.<ECallEventEntity>lambdaQuery().eq(ECallEventEntity::getIsDeleted, 0)); for (ECallEventEntity eCallEventEntity : list) { long count = eCallEventTwoService.count(Wrappers.<ECallEventTwoEntity>lambdaQuery() .eq(ECallEventTwoEntity::getOrderId, eCallEventEntity.getId())); if (count > 0) { continue; } ECallEventTwoEntity eCallEventTwoEntity = new ECallEventTwoEntity(); eCallEventTwoEntity.setLocation(eCallEventEntity.getLocation()); eCallEventTwoEntity.setSceneGeoLat(new BigDecimal(eCallEventEntity.getLat())); src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
@@ -364,7 +364,9 @@ } else { menuQueryWrapper.ne(Menu::getId, menu.getId()).eq(Menu::getIsDeleted, 0).and( wrapper -> wrapper.eq(Menu::getCode, menu.getCode()).or( o -> o.eq(Menu::getName, menu.getName()).eq(Menu::getCategory, MENU_CATEGORY) o -> o.eq(Menu::getName, menu.getName()) .eq(Menu::getCategory, MENU_CATEGORY) .eq(Menu::getMenuType, menu.getMenuType()) ) ); }