xiejun
2023-10-19 7795e413db43b5c2e282fcdb9607c059e09eceb5
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -1152,10 +1152,11 @@
         }
         QueryData queryData=queryClassifyVO.getData();
         UserVO userVo=queryData.getUser();
         systemId=queryData.getSystemId();
         //免密登录申请token,request中添加用户信息
         //passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
         passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
         systemId=queryData.getSystemId();
         QueryLibraryVO libraryVO= queryData.getLibrary();
         String libId= libraryVO.getId();
         List<String> classifyIdList=  libraryVO.getClassifyid();
@@ -1180,7 +1181,7 @@
            throw new Throwable("接口参数:账号信息获取失败");
         }
         List<CodeClassify> libIdDos =classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().in(CodeClassify::getId, libId));
         if(CollectionUtils.isEmpty(libIdDos)) {
         if(!CollectionUtils.isEmpty(libIdDos)) {
            CodeClassify libCodeClassify =libIdDos.get(0);
            String oid=libCodeClassify.getOid();
            if (!CollectionUtils.isEmpty(classifyIdList)) {
@@ -1529,10 +1530,11 @@
         }
         QueryData queryData=queryClassifyVO.getData();
         UserVO userVo=queryData.getUser();
         systemId=queryData.getSystemId();
         //免密登录申请token,request中添加用户信息
         //passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
         passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
         systemId=queryData.getSystemId();
         QueryLibraryVO libraryVO= queryData.getLibrary();
         String libId= libraryVO.getId();
         List<String> classifyIdList=  libraryVO.getClassifyid();
@@ -1598,7 +1600,7 @@
                              String num=StringUtils.isBlank(codeFixedValueVO.getOrderNum()+"")?"":codeFixedValueVO.getOrderNum()+"";
                              String name=StringUtils.isBlank(codeFixedValueVO.getName())?"":codeFixedValueVO.getName();
                              String description=StringUtils.isBlank(codeFixedValueVO.getDescription())?"":codeFixedValueVO.getDescription();
                           CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,name,"",description);
                           CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,id,"",description);
                           codeSectionValueVOList.add(sectionValueVO);
                           });
                        }else if(secType.equals("codeclassifysec")){//分类码段
@@ -1674,8 +1676,8 @@
                                       String id =Func.isNull(map.getOrDefault("OID".toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault("OID".toUpperCase(Locale.ROOT), "").toString();
                                       String value = Func.isNull(map.getOrDefault(valueField.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString();
                                       String text =Func.isNull(map.getOrDefault(textField.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString();
                                       String description = map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
                                       CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, "", description);
                                       String description =Func.isNull(map.getOrDefault("description".toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
                                       CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, id, "", description);
                                       codeSectionValueVOList.add(sectionValueVO);
                                    });
                                 }