Merge branch 'lvy' of http://219.151.181.73:3000/zhuwei/bladex into test-merge-02

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialDetectionController.java

@@ -553,6 +553,9 @@ public class TrialDetectionController extends BladeController {
             return R.fail("未获取到合同信息");
         }
         TrialSeleInspectionRecordInfoDTO vo = new TrialSeleInspectionRecordInfoDTO();
+        vo.setNodeId(nodeId);
+        vo.setContractId(contractId);
+        vo.setId(id);
         vo.setProjectName(projectInfo.getProjectName());
         vo.setConstructionUnit(contractInfo.getConstructionUnitName());
         if (contractInfo.getContractType().equals(2)) {

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

@@ -97,6 +97,9 @@ public class TextdictInfoServiceImpl extends ServiceImpl<TextdictInfoMapper, Tex
                     List<TextdictInfoVO> textdictList= baseMapper.selectTextdictInfoByExcelId(page, textdictInfo);
                     if (textdict == null || textdict.isEmpty()) {
                         textdict = textdictList;
+                        if (textdict != null) {
+                            textdict.forEach(textdictInfoVO -> textdictInfoVO.setIsSystem(2));
+                        }
                     } else if (textdictList != null && !textdictList.isEmpty()) {
                         Map<String, Map<String, TextdictInfoVO>> map = textdict.stream().collect(Collectors.groupingBy(TextdictInfoVO::getColKey, Collectors.toMap(TextdictInfoVO::getSigRoleId, v -> v, (v1, v2) -> v1)));
                         List<TextdictInfoVO> collect = textdictList.stream().filter(textdictInfoVO -> {