Merge branch 'test' into test-merge

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

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

@@ -78,22 +78,25 @@ public class TextdictInfoServiceImpl extends ServiceImpl<TextdictInfoMapper, Tex
                 if(Func.isNotEmpty(textdictInfo.getShowType()) && textdictInfo.getShowType() == 1){
                     if(Func.isNotEmpty(dqid) && dqid.size() > 0){
                         textdict = baseMapper.selectTextdictBYIds(dqid,privateInfo.getProjectId());
-                        if (textdict != null && !textdict.isEmpty()) {
-                            for (TextdictInfoVO vo : textdict) {
-                                keys.remove(vo.getColKey());
-                            }
-                            if (Func.isNotEmpty(keys)) {
-                                // 查询系统级电签配置
-                                List<TextdictInfoVO> textdictList = iSignConfigService.hasSignConfig(privateInfo.getInitTableName(), keys, textdict.get(0));
-                                textdict.addAll(textdictList);
-                            }
-                        }
                     }else {
                         textdict = new ArrayList<>();
                     }
                 }else{
                     textdict = baseMapper.selectTextdictInfoByExcelId(page, textdictInfo);
                 }
+                if (textdict != null && !textdict.isEmpty()) {
+                    for (TextdictInfoVO vo : textdict) {
+                        if (!(privateInfo.getPKeyId() + "").equals(vo.getTabId())) {
+                            vo.setIsSystem(1);
+                        }
+                        keys.remove(vo.getColKey());
+                    }
+                    if (Func.isNotEmpty(keys)) {
+                        // 查询系统级电签配置
+                        List<TextdictInfoVO> textdictList = iSignConfigService.hasSignConfig(privateInfo.getInitTableName(), keys, textdict.get(0));
+                        textdict.addAll(textdictList);
+                    }
+                }
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }