feature: 联调bug修改

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

@@ -59,7 +59,7 @@ public class AppColumnRelationFacade implements IAppColumnRelationFacaed {
             vo.setCodeValue(e.getCodeValue());
             String codeName = e.getCodeName();
             String[] split = codeName.split("->");
-            String relationName = split[0].split(StrUtil.UNDERLINE)[1] + split[1].split(StrUtil.UNDERLINE)[1];
+            String relationName = split[0].split(StrUtil.UNDERLINE)[1] + "->" + split[1].split(StrUtil.UNDERLINE)[1];
             vo.setColumnRelation(relationName);
             return vo;
         }).collect(Collectors.toList());
@@ -100,6 +100,11 @@ public class AppColumnRelationFacade implements IAppColumnRelationFacaed {
 
     @Override
     public ResponseStatus relationAdd(AppColumnSaveVo saveVo) {
+        String columnClaIdOne = saveVo.getColumnClaIdOne();
+        String columnClaIdTwo = saveVo.getColumnClaIdTwo();
+        if (columnClaIdOne.equals(columnClaIdTwo)) {
+            return ResponseStatus.fail("不能选择相同的分类");
+        }
         AppColumnRelation relation = getNewRelation(saveVo);
         AppColumnRelation exist = appColumnRelationService.getByCode(relation.getCodeValue());
         if (null != exist) {
@@ -121,7 +126,7 @@ public class AppColumnRelationFacade implements IAppColumnRelationFacaed {
         if (null != exist) {
             return ResponseStatus.fail("字段关系已存在");
         }
-        BeanUtils.copyProperties(relation, oldRelation, "createTime", "createUser");
+        BeanUtils.copyProperties(relation, oldRelation, "id", "createTime", "createUser");
         appColumnRelationService.update(oldRelation);
         return ResponseStatus.success();
     }
@@ -147,7 +152,8 @@ public class AppColumnRelationFacade implements IAppColumnRelationFacaed {
         relation.setColumnTwoClassValue(twoName);
         FieldCla firOneFieldCla = claMap.get(oneFieldCla.getFirId());
         FieldCla firTwoFieldCla = claMap.get(twoFieldCla.getFirId());
-        String code = firOneFieldCla.getName() + StrUtil.UNDERLINE + oneName + "->" + firTwoFieldCla + twoName;
+        String code = firOneFieldCla.getName() + StrUtil.UNDERLINE + oneName + "->"
+                + firTwoFieldCla.getName() + StrUtil.UNDERLINE + twoName;
         relation.setCodeName(code);
         relation.setCodeValue(code);
         relation.setDeleted(BooleanEnum.FALSE.value);

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

@@ -70,7 +70,7 @@ public class FieldClaFacade implements IFieldClaFacade {
     @Override
     public List<FieldClaDTO> getSecLevelColumn(SearchDTO searchDTO) {
         Searchable searchable = Searchable.toSearchable(searchDTO);
-        searchable.addSearchFilter("type", SearchOperator.eq, DataAuthTypeCodeEnum.AUTH_DATA_FIELD_SEC.value);
+        searchable.addSearchFilter("dataType", SearchOperator.eq, DataAuthTypeCodeEnum.AUTH_DATA_FIELD_SEC.value);
         List<FieldCla> list = fieldClaService.findList(searchable);
         return list.stream().map(e -> {
             FieldClaDTO dto = new FieldClaDTO();