Merge remote-tracking branch 'origin/master'

airport-admin/src/main/java/com/sundot/airport/web/controller/score/ScoreEventController.java

@@ -130,7 +130,7 @@ public class ScoreEventController extends BaseController {
      */
     private void resolveIndicatorIds(ScoreEvent entity) {
         // 通过二级指标名称查找ID
-        if (entity.getLevel2Name() != null && !entity.getLevel2Name().trim().isEmpty()) {
+        if (entity.getLevel2Name() != null && !entity.getLevel2Name().trim().isEmpty() && entity.getLevel2Id() == null) {
             Long level2Id = findIndicatorIdByName(entity.getLevel2Name().trim());
             if (level2Id != null) {
                 entity.setLevel2Id(level2Id);
@@ -138,7 +138,7 @@ public class ScoreEventController extends BaseController {
         }
         
         // 通过三级指标名称查找ID
-        if (entity.getLevel3Name() != null && !entity.getLevel3Name().trim().isEmpty()) {
+        if (entity.getLevel3Name() != null && !entity.getLevel3Name().trim().isEmpty() && entity.getLevel3Id() == null) {
             Long level3Id = findIndicatorIdByName(entity.getLevel3Name().trim());
             if (level3Id != null) {
                 entity.setLevel3Id(level3Id);
@@ -146,7 +146,7 @@ public class ScoreEventController extends BaseController {
         }
         
         // 通过四级指标名称查找ID
-        if (entity.getLevel4Name() != null && !entity.getLevel4Name().trim().isEmpty()) {
+        if (entity.getLevel4Name() != null && !entity.getLevel4Name().trim().isEmpty() && entity.getLevel4Id() == null) {
             Long level4Id = findIndicatorIdByName(entity.getLevel4Name().trim());
             if (level4Id != null) {
                 entity.setLevel4Id(level4Id);

airport-ledger/src/main/java/com/sundot/airport/ledger/mapper/ScoreIndicatorMapper.java

@@ -2,10 +2,11 @@ package com.sundot.airport.ledger.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sundot.airport.ledger.domain.ScoreIndicator;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface ScoreIndicatorMapper extends BaseMapper<ScoreIndicator> {
     List<ScoreIndicator> selectList(ScoreIndicator query);
-    List<ScoreIndicator> selectByDimensionId(Long dimensionId);
+    List<ScoreIndicator> selectByDimensionId(@Param("dimensionId") Long dimensionId);
 }