Browse Source

更改泛型

lijie 3 years ago
parent
commit
5ae75b090b

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectInfoController.java

@@ -114,7 +114,7 @@ public class ObjectInfoController {
         if (StrUtil.isNotBlank(objectTypeDefine.getParentCode())){
         if (StrUtil.isNotBlank(objectTypeDefine.getParentCode())){
             arrayNode.add(objectTypeDefine.getParentCode());
             arrayNode.add(objectTypeDefine.getParentCode());
         }
         }
-        objectNode.put(ObjectDigital.CLASS_CODE_HUM,arrayNode);
+        objectNode.set(ObjectDigital.CLASS_CODE_HUM,arrayNode);
         return objectTypeDefine;
         return objectTypeDefine;
     }
     }
 
 

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/IObjectInfoService.java

@@ -62,7 +62,7 @@ public interface IObjectInfoService {
      * @param queryWrapper 查询条件
      * @param queryWrapper 查询条件
      * @return 分页结果
      * @return 分页结果
      */
      */
-    Page queryByCondition(Page page, Wrapper<ObjectInfoDefine> queryWrapper);
+    Page<ObjectInfoDefine> queryByCondition(Page<ObjectInfoDefine> page, Wrapper<ObjectInfoDefine> queryWrapper);
 
 
     /**
     /**
      * 新增
      * 新增

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/ObjectInfoServiceImpl.java

@@ -82,7 +82,7 @@ public class ObjectInfoServiceImpl implements IObjectInfoService {
     }
     }
 
 
     @Override
     @Override
-    public Page queryByCondition(Page page, Wrapper<ObjectInfoDefine> queryWrapper) {
+    public Page<ObjectInfoDefine> queryByCondition(Page<ObjectInfoDefine> page, Wrapper<ObjectInfoDefine> queryWrapper) {
         return dao.selectPage(page, queryWrapper);
         return dao.selectPage(page, queryWrapper);
     }
     }