新增、修改、删除协议时序号重新排列(区分内外部订单)

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -212,7 +212,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         List<PtlAgreement> updateList = new ArrayList<>();
         List<PtlAgreement> list = ptlAgreementMapper.selectList(new QueryWrapper<PtlAgreement>()
                 .ge("serial_number", ptlAgreement.getSerialNumber())
-                .ne("id", ptlAgreement.getId()));
+                .ne("id", ptlAgreement.getId())
+                .eq("is_external", ptlAgreement.getIsExternal()));
         if (list != null && !list.isEmpty()) {
             int newSerialNumber = ptlAgreement.getSerialNumber();
             for (PtlAgreement ptlAgreement1 : list) {
@@ -614,7 +615,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         List<PtlAgreement> updateList = new ArrayList<>();
         List<PtlAgreement> list = ptlAgreementMapper.selectList(new QueryWrapper<PtlAgreement>()
                 .ge("serial_number", ptlAgreement.getSerialNumber())
-                .ne("id", agreementId));
+                .ne("id", agreementId)
+                .eq("is_external", ptlAgreement.getIsExternal()));
         if (list != null && !list.isEmpty()) {
             int newSerialNumber = ptlAgreement.getSerialNumber(); // 被删除协议的序列号
             for (PtlAgreement ptlAgreement1 : list) {
@@ -683,7 +685,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         List<PtlAgreement> updateList = new ArrayList<>();
         List<PtlAgreement> list = ptlAgreementMapper.selectList(new QueryWrapper<PtlAgreement>()
                         .ge("serial_number", ptlAgreement.getSerialNumber())
-                        .ne("id", agreementId));
+                        .ne("id", agreementId)
+                        .eq("is_external", ptlAgreement.getIsExternal()));
         if (list != null && list.size() > 0) {
             int newSerialNumber = ptlAgreement.getSerialNumber();
             for (PtlAgreement ptlAgreement1 : list) {