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

fix: 权限问题（默认带出起草部门）

Browse Source
This commit is contained in:
mzaxd
2023-11-13 11:15:30 +08:00
parent 765f5a3b9e
commit 758fef806d
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java
+14 -1
View File
@@ -22,8 +22,10 @@ import com.jero.modules.sys.entity.LawsGrade;
import com.jero.modules.sys.service.ILawsEnterpriseStandardLevelService;
import com.jero.modules.sys.service.ILawsGradeService;
import com.jero.modules.sys.utils.UserUtils;
import com.jero.modules.system.entity.SysDepart;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.model.DepartIdModel;
import com.jero.modules.system.service.ISysDepartService;
import com.jero.modules.system.service.ISysUserDepartService;
import com.jero.modules.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
@@ -72,6 +74,9 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
@Resource
private ILawsGradeService gradeService;
@Resource
private ISysDepartService sysDepartService;
@Override
public void saveTempPermission(LawsStandardTempPermission lawsStandardTempPermission) {
@@ -170,12 +175,15 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
records.forEach(kv -> kv.put(FieldCommon.DETAIL_FLAG, true));
return;
}
// 获取起草部门的Id
List<SysDepart> sysDeparts = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getDepartName, draftDepartName));
for (Map<String, Object> map : records) {
String standardId = (String) map.get(FieldCommon.ID);
Set<EnterpriseStandardAuthDept> curAuthSet = authDeptList.stream()
.filter(e -> e.getAuthDept() != null)
.filter(e -> StrUtil.isNotEmpty(e.getAuthDept()))
.filter(e -> e.getStandardId().equals(standardId))
.filter(e -> !e.getAuthDept().equals(sysDeparts.get(0).getId()))
.collect(Collectors.toSet());
LawsEnterpriseStandard es = esMap.get(standardId);
// 临时权限
@@ -282,12 +290,15 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
// 全部设置为有权限
records.forEach(kv -> kv.put(FieldCommon.DETAIL_FLAG, true));
}
// 获取起草部门的Id
List<SysDepart> sysDeparts = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getDepartName, draftDepartName));
for (Map<String, Object> map : records) {
String standardId = (String) map.get(FieldCommon.ID);
Set<EnterpriseStandardAuthDept> curAuthSet = authDeptList.stream()
.filter(e -> e.getAuthDept() != null)
.filter(e -> StrUtil.isNotEmpty(e.getAuthDept()))
.filter(e -> e.getStandardId().equals(standardId))
.filter(e -> !e.getAuthDept().equals(sysDeparts.get(0).getId()))
.collect(Collectors.toSet());
LawsEnterpriseStandard es = esMap.get(standardId);
// 临时权限
@@ -509,12 +520,14 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
// 全部设置为有权限
return true;
}
// 获取起草部门的Id
List<SysDepart> sysDeparts = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getDepartName, draftDepartName));
String finalStandardId = standardId;
Set<EnterpriseStandardAuthDept> curAuthSet = authDeptList.stream()
.filter(e -> e.getAuthDept() != null)
.filter(e -> StrUtil.isNotEmpty(e.getAuthDept()))
.filter(e -> e.getStandardId().equals(finalStandardId))
.filter(e -> !e.getAuthDept().equals(sysDeparts.get(0).getId()))
.collect(Collectors.toSet());
LawsEnterpriseStandard es = enterpriseStandardService.getById(standardId);