Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java

@@ -1069,7 +1069,8 @@
         .eq(CodeBasicSec::getPkCodeRule,codeRuleOid)
         .in(CodeBasicSec::getOid,codeBasicSecOidList)
         .eq(CodeBasicSec::getSerialDependFlag,"true")
         .orderByAsc(CodeBasicSec::getSerialDependOrder);
         //TODO: SerialDependOrder本来是用来流水排序的，但是现在的逻辑是按照orderuNum排序的
         .orderByAsc(CodeBasicSec::getOrderNum); //.orderByAsc(CodeBasicSec::getSerialDependOrder);
      List<CodeBasicSec> codeBasicSecList = this.list(wrapper);

      //按流水依赖顺序，处理流水依赖码段的值
@@ -1149,7 +1150,8 @@
         .eq(CodeBasicSec::getPkCodeRule,codeRuleOid)
         .in(CodeBasicSec::getOid,codeBasicSecOidList)
         .eq(CodeBasicSec::getSerialDependFlag,"true")
         .orderByAsc(CodeBasicSec::getSerialDependOrder);
         .orderByAsc(CodeBasicSec::getOrderNum); //.orderByAsc(CodeBasicSec::getSerialDependOrder);

      List<CodeBasicSec> codeBasicSecList = this.list(wrapper);
      //按流水依赖顺序，处理流水依赖码段的值
      List<String> serialDependValueList = new ArrayList<>();