From cb9fbcd27a288d0c61d85fa13ff5fc8eb1f4deab Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 18 三月 2023 16:44:56 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/show/ApplyController.java |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/show/ApplyController.java b/src/main/java/com/lf/server/controller/show/ApplyController.java
index c3041b5..745cd45 100644
--- a/src/main/java/com/lf/server/controller/show/ApplyController.java
+++ b/src/main/java/com/lf/server/controller/show/ApplyController.java
@@ -10,7 +10,6 @@
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.AesHelper;
 import com.lf.server.helper.StringHelper;
-import com.lf.server.service.data.DownloadService;
 import com.lf.server.service.show.ApplyService;
 import com.lf.server.service.show.FlowService;
 import com.lf.server.service.sys.TokenService;
@@ -29,7 +28,7 @@
  * 鏁版嵁鐢宠
  * @author WWW
  */
-@Api(tags = "杩愮淮绠＄悊\\鏁版嵁鐢宠")
+@Api(tags = "缁煎悎灞曠ず\\鏁版嵁鐢宠")
 @RestController
 @RequestMapping("/apply")
 public class ApplyController extends BaseController {
@@ -57,8 +56,8 @@
             if (null == reqEntity.getTabs() || null == reqEntity.getEntities() || reqEntity.getTabs().size() != reqEntity.getEntities().size()) {
                 return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
             }
-            if (null == reqEntity.getIds() || reqEntity.getIds().isEmpty()) {
-                return fail("璇烽�夋嫨鍗曚綅ID");
+            if (null == reqEntity.getDepcodes() || reqEntity.getDepcodes().isEmpty()) {
+                return fail("璇烽�夋嫨鍗曚綅缂栫爜");
             }
 
             reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
@@ -67,7 +66,7 @@
             }
 
             reqEntity.setPwd(AesHelper.decrypt(reqEntity.getPwd()));
-            if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
+            if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
                 return fail("瀵嗙爜涓嶇鍚堣姹�");
             }
 
@@ -76,7 +75,7 @@
 
             return success(rows);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -86,7 +85,7 @@
             @ApiImplicitParam(name = "uname", value = "鐢ㄦ埛鍚�", dataType = "String", paramType = "query", example = "鍛�"),
             @ApiImplicitParam(name = "status", value = "鐘舵��", dataType = "Integer", paramType = "query", example = "0"),
             @ApiImplicitParam(name = "start", value = "寮�濮嬫椂闂�", dataType = "Timestamp", paramType = "query", example = "2022-12-09 09:00:00"),
-            @ApiImplicitParam(name = "end", value = "缁撴潫鏃堕棿", dataType = "Timestamp", paramType = "query", example = "2022-12-25 17:00:00"),
+            @ApiImplicitParam(name = "end", value = "缁撴潫鏃堕棿", dataType = "Timestamp", paramType = "query", example = "2022-12-31 23:00:00"),
             @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
@@ -107,7 +106,7 @@
 
             return success(count, rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -121,7 +120,7 @@
 
             return success(rows);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -137,7 +136,7 @@
 
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -162,7 +161,7 @@
 
             return success(rows);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -187,7 +186,7 @@
 
             return success(rows);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -225,7 +224,7 @@
 
             return success(rows);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -258,7 +257,7 @@
 
             return success(rows);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 }

--
Gitblit v1.9.3