电签配置查询优化

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

@@ -304,7 +304,7 @@ public class SignConfigServiceImpl extends BaseServiceImpl<SignConfigMapper, Sig
             return textdictInfoVOS;
         }
         List<WbsFormElement> list = this.wbsFormElementMapper.selectList(Wrappers.<WbsFormElement>lambdaQuery().select(WbsFormElement::getEName, WbsFormElement::getEKey)
-                .eq(WbsFormElement::getFId, tableInfos.get(0).getId()).in(WbsFormElement::getEKey, keyMap.keySet()));
+                .eq(WbsFormElement::getFId, tableInfos.get(0).getId()).eq(WbsFormElement::getEType, 6).in(WbsFormElement::getEKey, keyMap.keySet()));
         if (list == null || list.isEmpty()) {
             return textdictInfoVOS;
         }

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

@@ -79,11 +79,11 @@ public class TextdictInfoServiceImpl extends ServiceImpl<TextdictInfoMapper, Tex
                 List<String> keys = new ArrayList<>();
                 for(Element ek:table){
                     dqid.addAll(Func.toStrList("\\|\\|",ek.attr("dqid")));
-                    Elements keyNames = ek.getElementsByAttribute("keyname");
-                    if(Func.isNotEmpty(keyNames)){
-                        for(Element keyName:keyNames){
-                            keys.add(keyName.attr("keyname"));
-                        }
+                }
+                Elements keyNames = doc.getElementsByAttribute("keyname");
+                if(Func.isNotEmpty(keyNames)){
+                    for(Element keyName:keyNames){
+                        keys.add(keyName.attr("keyname"));
                     }
                 }
                 if(Func.isNotEmpty(textdictInfo.getShowType()) && textdictInfo.getShowType() == 1){
@@ -132,7 +132,7 @@ public class TextdictInfoServiceImpl extends ServiceImpl<TextdictInfoMapper, Tex
                         if (textdict == null || textdict.isEmpty()) {
                             textdict = textdictConfigList;
                         } else {
-                            Map<String, Map<String, TextdictInfoVO>> map = textdict.stream().filter(vo -> vo.getColKey() != null && vo.getColKey().contains("__")).collect(Collectors.groupingBy(TextdictInfoVO::getColKey, Collectors.toMap(TextdictInfoVO::getSigRoleId, v -> v, (v1, v2) -> v1)));
+                            Map<String, Map<String, TextdictInfoVO>> map = textdict.stream().filter(vo -> vo.getColKey() != null && vo.getColKey().contains("__")).collect(Collectors.groupingBy(vo -> vo.getColKey().split("__")[1], Collectors.toMap(TextdictInfoVO::getSigRoleId, v -> v, (v1, v2) -> v1)));
                             List<TextdictInfoVO> collect = textdictConfigList.stream().filter(textdictInfoVO -> {
                                 if (textdictInfoVO.getColKey() == null || !textdictInfoVO.getColKey().contains("__")) {
                                     return true;
@@ -174,20 +174,24 @@ public class TextdictInfoServiceImpl extends ServiceImpl<TextdictInfoMapper, Tex
         Map<String, List<TextdictInfoVO>> colKeyMap = allTextdict.stream().collect(Collectors.groupingBy(TextdictInfoVO::getColKey));
         colKeyMap.forEach((colKey, textdictInfoVOs) -> {
             if (StringUtil.hasText(colKey)) {
-                String[] trtd = colKey.split("__")[1].split("_");
-                Element element = trs.get(Integer.parseInt(trtd[0])).select("td").get(Integer.parseInt(trtd[1]));
-                String dqIds = textdictInfoVOs.stream().map(vo -> vo.getId() + "").distinct().collect(Collectors.joining("||"));
-                if (StringUtil.hasText(dqIds)) {
-                    element.removeAttr("dqId");
-                    element.attr("dqId", dqIds);
-                    if (textdictInfoVOs.get(0).getType() == 2) { //个人签字 不能用户输入
-                        if (element.html().contains("el-tooltip")) {
-                            element.children().get(0).children().get(0).attr(":readonly", "true");
-                        } else {
-                            element.children().get(0).attr(":readonly", "true");
+                try {
+                    String[] trtd = colKey.split("__")[1].split("_");
+                    Element element = trs.get(Integer.parseInt(trtd[0])).select("td").get(Integer.parseInt(trtd[1]));
+                    String dqIds = textdictInfoVOs.stream().map(vo -> vo.getId() + "").distinct().collect(Collectors.joining("||"));
+                    if (StringUtil.hasText(dqIds)) {
+                        element.removeAttr("dqId");
+                        element.attr("dqId", dqIds);
+                        if (textdictInfoVOs.get(0).getType() == 2) { //个人签字 不能用户输入
+                            if (element.html().contains("el-tooltip")) {
+                                element.children().get(0).children().get(0).attr(":readonly", "true");
+                            } else {
+                                element.children().get(0).attr(":readonly", "true");
+                            }
                         }
+                        isUpdate.set(true);
                     }
-                    isUpdate.set(true);
+                } catch (Exception e) {
+                    log.error("解析失败: ", e);
                 }
             }
         });