中间计量申请变更令号

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MiddleMeterApplyMapper.xml

@@ -54,7 +54,9 @@
     </select>
     <select id="getNodeToken" resultType="org.springblade.meter.entity.ChangeTokenMeter">
         select * from s_change_token_meter
-        where is_deleted = 0 and contract_meter_id = #{nodeId} limit 1
+        where is_deleted = 0 and contract_meter_id = #{nodeId}
+        order by create_time desc
+        limit 1
     </select>
     <select id="getNodeDivide" resultType="org.springblade.meter.entity.MeterTreeContract">
         select *

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MiddleMeterApplyServiceImpl.java

@@ -200,7 +200,10 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
         }
         //获取变更令
         ChangeTokenForm tokenForm = baseMapper.getTokenById(nodeToken.getChangeTokenId());
-        return tokenForm.getChangeNumber();
+        if (tokenForm != null && StringUtils.isNotBlank(tokenForm.getChangeNumber())) {
+            return tokenForm.getChangeNumber();
+        }
+        return null;
     }
 
     /**