From 9739a073ef3b7f42f614f209c551d5c21fce8c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Wed, 20 Oct 2021 19:01:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40302?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayContactsManagementController.java | 8 ++--- .../system/controller/LoginController.java | 33 ++++++++++++++++--- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 07656205..8bbd82f5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -84,8 +84,8 @@ public class PayContactsManagementController extends JeroController queryPageList(PayContactsManagement payContactsManagement, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - if(!StringUtils.isBlank(payContactsManagement.getName()) && payContactsManagement.getName().length() > 20){ - return Result.error("姓名长度不能大于20个字符！"); + if(!StringUtils.isBlank(payContactsManagement.getName()) && payContactsManagement.getName().length() > 50){ + return Result.error("姓名长度不能大于50个字符！"); } if(!StringUtils.isBlank(payContactsManagement.getCompanyName()) && payContactsManagement.getCompanyName().length() > 50){ return Result.error("企业名称长度不能大于50个字符！"); @@ -486,8 +486,8 @@ public class PayContactsManagementController extends JeroController 20){ - return Result.error("姓名长度不能大于20个字符!"); + if(name.length() > 50){ + return Result.error("姓名长度不能大于50个字符!"); } try { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java index 32651871..dbed2379 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java @@ -6,10 +6,14 @@ import com.alibaba.fastjson.JSONObject; import com.aliyuncs.exceptions.ClientException; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; +import com.jero.modules.system.entity.SysRole; +import com.jero.modules.system.entity.SysUserRole; import com.jero.modules.system.model.SysLoginVO; +import com.jero.modules.system.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.SecurityUtils; import com.jero.common.api.vo.Result; import com.jero.common.constant.CacheConstant; @@ -23,10 +27,6 @@ import com.jero.common.util.encryption.EncryptedString; import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.model.SysLoginModel; -import com.jero.modules.system.service.ISysDepartService; -import com.jero.modules.system.service.ISysDictService; -import com.jero.modules.system.service.ISysLogService; -import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.util.RandImageUtil; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -37,6 +37,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.*; +import java.util.stream.Collectors; /** * @Author scott @@ -63,6 +64,10 @@ public class LoginController { private BaseCommonService baseCommonService; @Resource private AuthenticationUtils authenticationUtils; + @Resource + private ISysRoleService sysRoleService; + @Resource + private ISysUserRoleService sysUserRoleService; private static final String BASE_CHECK_CODES = "qwertyuiplkjhgfdsazxcvbnmQWERTYUPLKJHGFDSAZXCVBNM1234567890"; /** @@ -161,6 +166,26 @@ public class LoginController { //update-begin--Author:wangshuai Date:20200714 for：登录日志没有记录人员 LoginUser loginUser = new LoginUser(); BeanUtils.copyProperties(sysUser, loginUser); + // 新增用户角色code + LambdaQueryWrapper querySysUserRole = new LambdaQueryWrapper(); + querySysUserRole.eq(SysUserRole::getUserId,sysUser.getId()); + List listSysUserRole = sysUserRoleService.list(querySysUserRole); + if(!CollectionUtils.isEmpty(listSysUserRole)){ + List listStr = listSysUserRole.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()); + LambdaQueryWrapper querySysRole = new LambdaQueryWrapper(); + querySysRole.in(SysRole::getId,listStr); + List listSysRole = sysRoleService.list(querySysRole); + if(!CollectionUtils.isEmpty(listSysRole)){ + StringBuilder sb = new StringBuilder(); + listSysRole.forEach(p->{ + sb.append(p.getRoleCode()); + if(listSysRole.indexOf(p) != (listSysRole.size() - 1)){ + sb.append(","); + } + }); + loginUser.setRoleCode(sb.toString()); + } + } baseCommonService.addLog("账号: " + username + ",登录成功！", CommonConstant.LOG_TYPE_1, null, loginUser); //update-end--Author:wangshuai Date:20200714 for：登录日志没有记录人员 return result;