LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug#40302

Browse Source
This commit is contained in:
梁琦涛
2021-10-20 19:01:22 +08:00
parent 2481d4a9ed
commit 9739a073ef
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+4 -4
View File
@@ -84,8 +84,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
public Result<?> 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<PayContactsM
if(StringUtils.isBlank(companyId)){
return Result.error("企业id不能为空！");
}
if(name.length() > 20){
return Result.error("姓名长度不能大于20个字符!");
if(name.length() > 50){
return Result.error("姓名长度不能大于50个字符!");
}
try {
LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
+29 -4
View File
@@ -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<SysUserRole> querySysUserRole = new LambdaQueryWrapper();
querySysUserRole.eq(SysUserRole::getUserId,sysUser.getId());
List<SysUserRole> listSysUserRole = sysUserRoleService.list(querySysUserRole);
if(!CollectionUtils.isEmpty(listSysUserRole)){
List<String> listStr = listSysUserRole.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
LambdaQueryWrapper<SysRole> querySysRole = new LambdaQueryWrapper();
querySysRole.in(SysRole::getId,listStr);
List<SysRole> 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;