From 2b170e6c4c20a4fe4f113c5a7ca0f3210c278d7f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 04 二月 2023 15:19:04 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/data/MetaController.java |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index bd79283..f64dd71 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -13,7 +13,6 @@
 import com.lf.server.entity.data.DictEntity;
 import com.lf.server.entity.data.DownloadEntity;
 import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.MetaFileEntity;
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.ClassHelper;
 import com.lf.server.helper.Md5Helper;
@@ -63,7 +62,7 @@
     @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
-            @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "10"),
+            @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1"),
             @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
             @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
@@ -144,11 +143,7 @@
             }
 
             QueryWrapper wrapper = new QueryWrapper();
-            //wrapper.eq("dirid", meta.getDirid());
-            //wrapper.eq("depid", meta.getDepid());
-            //wrapper.eq("verid", meta.getVerid());
-            wrapper.eq("createuser", meta.getCreateUser());
-            wrapper.eq("createtime", meta.getCreateTime());
+            wrapper.eq("parentid", meta.getEventid());
 
             Page<Object> page = new Page<>(pageIndex, pageSize);
             page.addOrder(OrderItem.asc("gid"));
@@ -234,8 +229,7 @@
     @GetMapping(value = "/delete")
     public ResponseMsg<Integer> delete(int id) {
         try {
-            // int count = metaService.delete(id)
-            int count = metaService.deleteCascade(String.valueOf(id));
+            int count = metaService.delete(id);
 
             return success(count);
         } catch (Exception ex) {
@@ -255,9 +249,7 @@
                 return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
             }
 
-            // int count = metaService.deletes(ids)
-            String idStr = StringHelper.join(ids, ",");
-            int count = metaService.deleteCascade(idStr);
+            int count = metaService.deletes(ids);
 
             return success(count);
         } catch (Exception ex) {
@@ -361,11 +353,11 @@
             if (!DownloadService.decryptPwd(reqEntity)) {
                 return fail("瀵嗙爜瑙e瘑澶辫触", null);
             }
-            if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
+            if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
                 return fail("瀵嗙爜涓嶇鍚堣姹�");
             }
 
-            List<MetaFileEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
+            List<MetaEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
             if (null == list || list.isEmpty()) {
                 return fail("娌℃湁鎵惧埌鍏冩暟鎹�");
             }

--
Gitblit v1.9.3