还原

src/main/java/com/dk/mdm/controller/common/CommonController.java

@@ -73,7 +73,7 @@ public class CommonController extends BaseController<Map<String, Object>> {
             notes = "获取系统表数据种类"
     )
     @PostMapping("get_data_kind")
-    public ResponseResultVO<PageList<Map<String, Object>>> getDataKind(@RequestBody Map<String, Object> param) {
+    public ResponseResultVO<List<Map<String, Object>>> getDataKind(@RequestBody Map<String, Object> param) {
         return commonService.getDataKind(param);
     }
 

src/main/java/com/dk/mdm/mapper/common/CommonMapper.java

@@ -57,7 +57,7 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      */
     List<Map<String, Object>> getDataKind(Map param);
 
-    Long getDataKindCount(Map param);
+
 
     /**
      * @desc : 获取组织部门

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -159,25 +159,6 @@
         </if>
     </select>
 
-    <select id="getDataKindCount" resultType="Long">
-        select
-        count(1)
-        from sys.t_data_kind
-        where flg_valid
-        <if test="kindType != null">
-            AND kind_type = #{kindType}
-        </if>
-        <if test="usedFlag != null">
-            AND kind_tags -> 'used' ?? '标签'
-        </if>
-        <if test="kindTag != null">
-            AND kind_tags -> 'used' ?? #{kindTag}
-        </if>
-        <if test="kindCodeList != null and kindCodeList.size()>0">
-            AND kind_code =any(#{kindCodeList,typeHandler=StringListTypeHandler})
-        </if>
-    </select>
-
 
     <!-- 获取组织部门 -->
     <select id="getOrg" resultType="java.util.Map">

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -160,16 +160,11 @@ public class CommonService extends BaseService<Map<String, Object>> {
      * @author : 周兴
      * @date : 2023/1/6 11:41
      */
-    public ResponseResultVO<PageList<Map<String, Object>>> getDataKind(Map<String, Object> param) {
-        // 校验分页参数
-        if (param.get("pageSize") == null || param.get("currentPage") == null) {
-            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
-        }
-        // 分页参数赋值
-        param = this.getLimit(param);
-        return super.mergeListWithCount(param, commonMapper.getDataKind(param),
-                commonMapper.getDataKindCount(param));
+    public ResponseResultVO<List<Map<String, Object>>> getDataKind(Map<String, Object> param) {
+        // 获取系统基础数据
+        List<Map<String, Object>> list = commonMapper.getDataKind(param);
 
+        return ResponseResultUtil.success(list);
     }
 
     /**