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 | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 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 612d6c7..6e9c262 100644 --- a/src/main/java/com/lf/server/controller/show/ApplyController.java +++ b/src/main/java/com/lf/server/controller/show/ApplyController.java @@ -13,6 +13,7 @@ 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; @@ -28,7 +29,7 @@ * 鏁版嵁鐢宠 * @author WWW */ -@Api(tags = "杩愮淮绠$悊\\鏁版嵁鐢宠") +@Api(tags = "缁煎悎灞曠ず\\鏁版嵁鐢宠") @RestController @RequestMapping("/apply") public class ApplyController extends BaseController { @@ -40,6 +41,9 @@ @Autowired TokenService tokenService; + + @Autowired + UserService userService; @SysLog() @ApiOperation(value = "鎻掑叆鏁版嵁鐢宠") @@ -56,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())); @@ -66,7 +70,7 @@ } reqEntity.setPwd(AesHelper.decrypt(reqEntity.getPwd())); - if (!StringHelper.checkPwdValid(reqEntity.getPwd())) { + if (StringHelper.isPwdInvalid(reqEntity.getPwd())) { return fail("瀵嗙爜涓嶇鍚堣姹�"); } @@ -75,7 +79,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -106,7 +110,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -120,7 +124,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -136,7 +140,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -161,7 +165,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -186,7 +190,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -219,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); } } @@ -257,7 +262,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } -- Gitblit v1.9.3