feature: 人员导入修改、分级分类保存dataCode

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/DataResourceFacade.java

@@ -310,7 +310,7 @@ public class DataResourceFacade implements IDataResourceFacade {
     private DataResourceClassifyVo getFieldClassifyTree(List<AppDataResourceInfo> tabInfos, List<AppDataItemInfo> colInfos) {
         Map<String, AppDataResourceInfo> tableMap = tabInfos
                 .stream()
-                .collect(Collectors.toMap(AppDataResourceInfo::getDataObjectId, e -> e));
+                .collect(Collectors.toMap(AppDataResourceInfo::getId, e -> e));
         Map<String, List<AppDataItemInfo>> colInfosMap = getColumnClaGroupMap(colInfos);
 
         DataResourceEnum dataResourceEnum = DataResourceEnum.COLUMN_CLASSIFY;
@@ -829,7 +829,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             vo.setLabel(e.getTableName());
             vo.setDataType(AppDataTypeEnum.TAB.getValue());
             if (null != colInfosMap) {
-                List<AppDataItemInfo> colInfoList = colInfosMap.get(e.getDataObjectId());
+                List<AppDataItemInfo> colInfoList = colInfosMap.get(e.getId());
                 if (CollectionUtils.isNotEmpty(colInfoList)) {
                     List<DataResourceTreeVo> colVos = convertColumnToTreeVo(e.getId(), colInfoList);
                     vo.setChild(colVos);

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/impl/AppDataResourceInfoServiceImpl.java

@@ -71,7 +71,7 @@ public class AppDataResourceInfoServiceImpl implements IAppDataResourceInfoServi
                 AppDataResourceInfo::getDataClassifyTwoCode, AppDataResourceInfo::getDataLabelOneCode,
                 AppDataResourceInfo::getDataLabelTwoCode, AppDataResourceInfo::getDataLabelThreeCode,
                 AppDataResourceInfo::getDataLabelFourCode, AppDataResourceInfo::getDataLabelFiveCode);
-        query.isNotNull(e -> StringUtils.isNotBlank(e.getDataClassification()));
+        query.isNotNull(AppDataResourceInfo::getDataClassification);
         List<AppDataResourceInfo> appDataResourceInfos = appDataResourceInfoMapper.selectList(query);
         return appDataResourceInfos.stream()
                 .filter(e -> StringUtils.isNotBlank(e.getDataClassification()))