Merge branch 'feature-lihb-20250716' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

# Conflicts:
#	blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsSynchronousServiceImpl.java

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsSynchronousServiceImpl.java

@@ -714,20 +714,23 @@ public class WbsSynchronousServiceImpl {
                                                     //未填报 101
                                                     isSync = true;
                                                 } else {
-                                                    if (submit == null || i == 0) {
-                                                        throw new ServiceException(wbsTreeContract.getNodeName() + "--下表单未查到填报信息");
+                                                    if (i == 0) {
+                                                        throw new ServiceException(editContractNode.getNodeName() + "--表单未查到填报信息");
                                                     }
-                                                    if (i > 0 && contractRanges.contains(WbsSyncTypeEnum.ALREADY_FILLED_IN_NOT_REPORTED.code)) {
+                                                    if (contractRanges.contains(WbsSyncTypeEnum.ALREADY_FILLED_IN_NOT_REPORTED.code)) {
                                                         //已填报-未上报 102
                                                         isSync = true;
-                                                    } else if (submit == 1 && contractRanges.contains(WbsSyncTypeEnum.PENDING_APPROVAL.code)) {
-                                                        //待审批 104
-                                                        isSync = true;
-                                                        isOldHtml = true;
-                                                    } else if (submit == 2 && contractRanges.contains(WbsSyncTypeEnum.APPROVED.code)) {
-                                                        //已审批 105
-                                                        isSync = true;
-                                                        isOldHtml = true;
+                                                    } else {
+                                                        if (submit == null) {
+                                                            throw new ServiceException(wbsTreeContract.getNodeName() + "--下表单未查到上报信息");
+                                                        }
+                                                        if (submit == 1 && contractRanges.contains(WbsSyncTypeEnum.PENDING_APPROVAL.code)) {
+                                                            //待审批 104
+                                                            isSync = true;
+                                                        } else if (submit == 2 && contractRanges.contains(WbsSyncTypeEnum.APPROVED.code)) {
+                                                            //已审批 105
+                                                            isSync = true;
+                                                        }
                                                     }
                                                 }
                                                 break;