skyline 2 سال پیش
والد
کامیت
9697f85a21

+ 1 - 0
service/src/main/java/com/kym/service/admin/impl/RoleServiceImpl.java

@@ -31,6 +31,7 @@ public class RoleServiceImpl extends MPJBaseServiceImpl<RoleMapper, Role> implem
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Object add(Role role) {
+        role.setId(null);
         return save(role);
     }
 

+ 1 - 1
service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java

@@ -125,7 +125,7 @@ public class ChargeOrderServiceImpl extends MPJBaseServiceImpl<ChargeOrderMapper
         result = result.stream().map(item ->
                         item.setShortId(KymCache.INSTANCE.getShortIdByEquipmentIdOrConnectorId(item.getConnectorId()))
                                 .setStationName(KymCache.INSTANCE.getStationNameById(item.getStationId())))
-                .collect(Collectors.toList());
+                .toList();
 
         // stationId,startChargeSeq,connectorId,startTime,endTime,totalPower,totalMoney,elecMoney,serviceMoney,orderStatus,chargeStatus,stopReason,invoiceStatus
         var rows = result.stream().map(item -> {