From 71726a1cb05790d6841595ef7daef5173f2cddfa Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 29 三月 2023 09:43:11 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/show/ApplyController.java |   34 +++++++++++++++++++---------------
 1 files changed, 19 insertions(+), 15 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..6e9c262 100644
--- a/src/main/java/com/lf/server/controller/show/ApplyController.java
+++ b/src/main/java/com/lf/server/controller/show/ApplyController.java
@@ -10,10 +10,10 @@
 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;
+import com.lf.server.service.sys.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -29,7 +29,7 @@
  * 鏁版嵁鐢宠
  * @author WWW
  */
-@Api(tags = "杩愮淮绠＄悊\\鏁版嵁鐢宠")
+@Api(tags = "缁煎悎灞曠ず\\鏁版嵁鐢宠")
 @RestController
 @RequestMapping("/apply")
 public class ApplyController extends BaseController {
@@ -41,6 +41,9 @@
 
     @Autowired
     TokenService tokenService;
+
+    @Autowired
+    UserService userService;
 
     @SysLog()
     @ApiOperation(value = "鎻掑叆鏁版嵁鐢宠")
@@ -57,8 +60,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 +70,7 @@
             }
 
             reqEntity.setPwd(AesHelper.decrypt(reqEntity.getPwd()));
-            if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
+            if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
                 return fail("瀵嗙爜涓嶇鍚堣姹�");
             }
 
@@ -76,7 +79,7 @@
 
             return success(rows);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -86,7 +89,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 +110,7 @@
 
             return success(count, rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -121,7 +124,7 @@
 
             return success(rows);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -137,7 +140,7 @@
 
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -162,7 +165,7 @@
 
             return success(rows);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -187,7 +190,7 @@
 
             return success(rows);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -220,12 +223,13 @@
 
             applyEntity = applyService.selectById(applyEntity.getId());
             if (StaticData.TEN == applyEntity.getStatus()) {
-                applyService.zipDbData(ue, applyEntity);
+                UserEntity user = userService.selectUser(applyEntity.getUserid());
+                applyService.zipDbData(user, applyEntity);
             }
 
             return success(rows);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -258,7 +262,7 @@
 
             return success(rows);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 }

--
Gitblit v1.9.3