cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug--代码规范优化，升级fastjson1.2.73

Browse Source
This commit is contained in:
taochengbo
2020-08-29 16:17:15 +08:00
parent 574c7219ac
commit 0f05897962
64 changed files with 727 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yshop-admin/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java
View File

@ -46,7 +46,9 @@ public class RedisServiceImpl implements RedisService {
continue;
}
DataType dataType = redisTemplate.type(s.toString());
if(!dataType.code().equals("string")) continue;
if(!"string".equals(dataType.code())) {
continue;
}
RedisVo redisVo = new RedisVo(s.toString(),redisTemplate.opsForValue().get(s.toString()).toString());
redisVos.add(redisVo);
}

2
yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java
View File

@ -133,7 +133,7 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, Dept> implement
if(isChild) {
depts.add(deptDto);
for (Dept dept : deptList) {
if(dept.getId() == deptDto.getPid() && !deptNames.contains(dept.getName())){
if(dept.getId().equals(deptDto.getPid()) && !deptNames.contains(dept.getName())){
depts.add(deptDto);
}
}

2
yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java
View File

@ -72,7 +72,7 @@ public class JobServiceImpl extends BaseServiceImpl<JobMapper, Job> implements J
//断权限范围
for (Long deptId : criteria.getDeptIds()) {
for (Job job : jobList) {
if(deptId ==job.getDeptId()){
if(deptId.equals(job.getDeptId())){
job.setDept(deptService.getById(job.getDeptId()));
}
}

4
yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java
View File

@ -315,7 +315,9 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
if(StringUtils.isNotBlank(resources.getComponentName())&&resources.getType()!=0){
int menuCount = this.lambdaQuery().eq(Menu::getComponentName,resources.getComponentName()).count();
if(menuCount > 1) throw new YshopException("请保持菜单组件名称唯一");
if(menuCount > 1) {
throw new YshopException("请保持菜单组件名称唯一");
}
menu1 = this.getOne(new QueryWrapper<Menu>().lambda()
.eq(Menu::getComponentName,resources.getComponentName()));
if(menu1 != null && !menu1.getId().equals(menu.getId())){

4
yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java
View File

@ -144,7 +144,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, User> imp
public UserDto findByName(String userName) {
User user = userMapper.findByName(userName);
if(user == null) throw new YshopException("当前用户不存在");
if(user == null) {
throw new YshopException("当前用户不存在");
}
//用户所属岗位
user.setJob(jobService.getById(user.getJobId()));
//用户所属部门