From d0d40b7b3585e4c708d81218c3a8e006ceb8a72f Mon Sep 17 00:00:00 2001 From: DELL Date: Thu, 25 Apr 2024 19:33:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:1=E3=80=81=E7=9F=AD=E4=BF=A1=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E7=99=BB=E5=BD=95=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=BA=E7=A9=BAbug=EF=BC=9B=202=E3=80=81=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E6=A0=87=E8=AF=86=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=B8=8D=E5=AD=98=E5=9C=A8=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=8F=90=E7=A4=BA=E4=BC=81=E4=B8=9A=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E6=88=96=E8=80=85=E8=B4=A6=E5=8F=B7=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=203=E3=80=81=E9=87=8D=E8=AE=BE=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=AF=B9=E7=99=BB=E5=BD=95=E5=90=8D=E5=92=8C?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BF=9B=E8=A1=8C=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyAuthenticationProvider.java | 2 +- .../admin/service/impl/UserServiceImpl.java | 2 ++ .../ocr/controller/OcrSUserTController.java | 23 ++++++++++++++++++- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java index 38cc06aa..8e780ae9 100644 --- a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java +++ b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java @@ -136,7 +136,7 @@ public class MyAuthenticationProvider implements AuthenticationProvider { //判断账号是否存在 if(!"admin".equals(loginname) && userTokenService.listLoginNameCount(agentcode,loginname).intValue() <= 0){ - throw new AuthenticationServiceException("账号不存在！"); + throw new AuthenticationServiceException("账号或企业编码不存在！"); } //数据库查询用户对象 diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserServiceImpl.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserServiceImpl.java index 44ecf7b2..199c01af 100644 --- a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserServiceImpl.java +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserServiceImpl.java @@ -630,6 +630,8 @@ public class UserServiceImpl extends BaseServiceImpl imple User user = this.usermybatisdao.selectById(id); if(null != user){ + List frontmenuTList1 = isFrontmenuTService.queryUserMenuById(user.getLoginname()); + user.setFrontmenuTList(frontmenuTList1); List departmentList = this.departmentMybatisDao.selectDeptByUserid(user.getId()); user.formatDeptlist(departmentList); //user.setTenantList(this.userTenantService.listUserTenant(user.getId())); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java index 440f3d19..2daea9af 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java @@ -10,6 +10,7 @@ import cn.jyjz.xiaoyao.framework.security.service.SmsLoginService; import cn.jyjz.xiaoyao.ocr.dataobject.OcrSUserT; import cn.jyjz.xiaoyao.ocr.service.OcrISUserTService; import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import io.swagger.annotations.ApiOperation; @@ -64,9 +65,29 @@ public class OcrSUserTController { if(null !=map.get("rePasswrod")){ if(map.get("newPassword").equals(map.get("rePasswrod"))){ +// BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder(); +// UpdateWrapper updatewrapper = new UpdateWrapper<>(); +// updatewrapper.eq("MOBILE", map.get("loginname")).set("PASSWORD",bCryptPasswordEncoder.encode(map.get("newPassword"))); + String MOBILE = ""; BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder(); + if(StringUtils.isNotBlank(map.get("loginname"))){ + LambdaQueryWrapper ocrSUserTLambdaQueryWrapper = new LambdaQueryWrapper<>(); + ocrSUserTLambdaQueryWrapper.eq(OcrSUserT::getLoginname, map.get("loginname")); + OcrSUserT ocrSUserT = sUserTService.getOne(ocrSUserTLambdaQueryWrapper); + if(ocrSUserT != null){ + MOBILE = ocrSUserT.getMobile(); + } + }else { + return ResultVoUtil.success(ResultVo.SUCCESS,"请输入登录名！"); + } + UpdateWrapper updatewrapper = new UpdateWrapper<>(); - updatewrapper.eq("MOBILE", map.get("loginname")).set("PASSWORD",bCryptPasswordEncoder.encode(map.get("newPassword"))); +// updatewrapper.eq("MOBILE", map.get("loginname")).set("PASSWORD",bCryptPasswordEncoder.encode(map.get("newPassword"))); +// updatewrapper.eq("MOBILE", map.get("loginname")) +// .set("PASSWORD",bCryptPasswordEncoder.encode(map.get("newPassword"))); + updatewrapper.eq("MOBILE", MOBILE) + .eq("LOGINNAME", map.get("loginname")) + .set("PASSWORD",bCryptPasswordEncoder.encode(map.get("newPassword"))); boolean update = sUserTService.update(updatewrapper); if(update){