ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

内部工作组左侧属性修改

Browse Source
This commit is contained in:
梁琦涛
2023-11-08 18:08:41 +08:00
parent a591de02e3
commit dbb87ec8c0
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
-3
View File
@@ -7,11 +7,9 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.ImportExcelUtil;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.modules.sys.entity.LawsWorkingGroup;
import com.jero.modules.sys.entity.LawsWorkingGroupUser;
import com.jero.modules.sys.entity.LawsWorkingGroupUserImport;
import com.jero.modules.sys.service.ILawsWorkingGroupUserService;
@@ -23,7 +21,6 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java
+30 -6
View File
@@ -22,6 +22,7 @@ import com.jero.modules.system.entity.SysUserRole;
import com.jero.modules.system.service.ISysRoleService;
import com.jero.modules.system.service.ISysUserRoleService;
import com.jero.modules.system.service.ISysUserService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -67,20 +68,43 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl<LawsWorkingGrou
String userRoleName = lawsWorkingGroupUser.getUserRoleName();
String userPostName = lawsWorkingGroupUser.getUserPostName();
String workingGroupId = lawsWorkingGroupUser.getWorkingGroupId();
List<String> workingGroupIds = new ArrayList<>();
if(!StringUtils.isBlank(workingGroupId)){
LawsWorkingGroup lawsWorkingGroup = lawsWorkingGroupService.queryById(workingGroupId);
if(Objects.isNull(lawsWorkingGroup)){
throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
}
// 层级二查看分会下所有工作组数据
if(Objects.equals(lawsWorkingGroup.getLevel(),2)){
LambdaQueryWrapper<LawsWorkingGroup> queryLawsWorkingGroup = new LambdaQueryWrapper<>();
queryLawsWorkingGroup.eq(LawsWorkingGroup::getPid,lawsWorkingGroup.getId());
List<LawsWorkingGroup> listLawsWorkingGroup = lawsWorkingGroupService.list(queryLawsWorkingGroup);
if(!CollectionUtils.isEmpty(listLawsWorkingGroup)){
workingGroupIds.addAll(listLawsWorkingGroup.stream().map(LawsWorkingGroup::getId).collect(Collectors.toList()));
}
}
// 层级3 直接查工作组数据
if(Objects.equals(lawsWorkingGroup.getLevel(),3)){
workingGroupIds.add(workingGroupId);
}
}
LambdaQueryWrapper<LawsWorkingGroupUser> wrapper = new LambdaQueryWrapper<>();
if(!CollectionUtils.isEmpty(workingGroupIds)){
wrapper.in(LawsWorkingGroupUser::getWorkingGroupId, workingGroupIds);
}
if (!StringUtils.isAllBlank(realname, userName, userRoleName, userPostName)){
List<String> ids = lawsWorkingGroupUserSearch(realname, userName, userRoleName, userPostName);
if (ids.isEmpty()){
return new Page<>();
}
LambdaQueryWrapper<LawsWorkingGroupUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(workingGroupId), LawsWorkingGroupUser::getWorkingGroupId, workingGroupId);
wrapper.eq(LawsWorkingGroupUser::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
wrapper.in(LawsWorkingGroupUser::getUserId, ids);
return page(page, wrapper);
}
//没选上面四个筛选条件时
QueryWrapper<LawsWorkingGroupUser> queryWrapper = QueryGenerator.initQueryWrapper(lawsWorkingGroupUser, req.getParameterMap());
return page(page, queryWrapper);
// 没选上面四个筛选条件时
return page(page, wrapper);
}
/**
@@ -225,7 +249,7 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl<LawsWorkingGrou
LambdaQueryWrapper<SysUserRole> wrapper = Wrappers.lambdaQuery();
wrapper.eq(SysUserRole::getUserId, user.getUserId());
List<SysUserRole> sysUserRoles = sysUserRoleService.list(wrapper);
if (sysUserRoles.size() > 0){
if (!CollectionUtils.isEmpty(sysUserRoles)){
List<SysRole> roles = sysRoleService.listByIds(sysUserRoles.stream().map(SysUserRole::getRoleId).distinct().collect(Collectors.toList()));
String roleNames = roles.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
user.setUserRoleName(roleNames);