后管表单关联优化

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -810,8 +810,13 @@ public class ExcelTabController extends BladeController {
                     int i = 5;
                     Element parent = element.parent();
                     while (i > 0 && parent != null) {
-                        if (parent.hasAttr("title")) {
-                            element.attr("dqid", config.getId() + "");
+                        if (parent.hasAttr("title") || parent.hasAttr("dqid")) {
+                            String dqid = element.attr("dqid");
+                            if (dqid != null && !dqid.isEmpty()) {
+                                element.attr("dqid", dqid + "||" + config.getId());
+                            } else {
+                                element.attr("dqid", config.getId() + "");
+                            }
                             return true;
                         }
                         parent = parent.parent();

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/TextdictInfoController.java

@@ -750,7 +750,7 @@ public class TextdictInfoController extends BladeController {
         if (!updateList.isEmpty()) {
             for (TextdictInfo info : updateList) {
                 this.textdictInfoService.update(Wrappers.<TextdictInfo>lambdaUpdate().eq(TextdictInfo::getId, info.getId()).eq(TextdictInfo::getProjectId, info.getProjectId())
-                        .eq(TextdictInfo::getExcelId, info.getExcelId()).eq(TextdictInfo::getSigRoleId, info.getSigRoleId())
+                        .set(info.getExcelId() != null ,TextdictInfo::getExcelId, info.getExcelId()).set(info.getSigRoleId() != null ,TextdictInfo::getSigRoleId, info.getSigRoleId())
                         .set(info.getName() != null ,TextdictInfo::getName, info.getName())
                         .set(info.getType() != null ,TextdictInfo::getType, info.getType())
                         .set(info.getColName() != null, TextdictInfo::getColName, info.getColName())