|
@@ -130,14 +130,6 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@Override
|
|
|
public List<PrintPlanBrief> printPlanBriefQuery(String source, String module) {
|
|
|
-
|
|
|
- List<ExamPrintPlan> examPrintPlanList = this.list();
|
|
|
- for (ExamPrintPlan examPrintPlan : examPrintPlanList) {
|
|
|
- Long id = examPrintPlan.getId();
|
|
|
- String name = examPrintPlan.getName();
|
|
|
- PrintPlanStatusEnum status = examPrintPlan.getStatus();
|
|
|
- printPlanBriefList.add(new PrintPlanBrief(id, name ,status));
|
|
|
- }*/
|
|
|
Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
|
|
|
List<PrintPlanBrief> list;
|
|
|
if ("client".equals(source)) {
|
|
@@ -145,8 +137,21 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
|
|
|
String[] status = {PrintPlanStatusEnum.READY.name(), PrintPlanStatusEnum.PRINTING.name(), PrintPlanStatusEnum.PRINT_FINISH.name()};
|
|
|
list = this.baseMapper.listToClient(schoolId, source, module, status, sysUser.getOrgId());
|
|
|
} else {
|
|
|
- DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission();
|
|
|
- String[] status = {PrintPlanStatusEnum.READY.name(), PrintPlanStatusEnum.PRINTING.name(), PrintPlanStatusEnum.PRINT_FINISH.name()};
|
|
|
+ Long privilegeId = ServletUtil.getCurrentPrivilegeId();
|
|
|
+ DataPermissionRule dpr = new DataPermissionRule();
|
|
|
+
|
|
|
+ SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
|
+
|
|
|
+
|
|
|
+ if (privilegeId == null) {
|
|
|
+ dpr.setRequestUserId(sysUser.getId());
|
|
|
+ dpr.setOrgIdSet(null);
|
|
|
+ } else if ("44".equals(privilegeId.toString())){
|
|
|
+ dpr = basicRoleDataPermissionService.findDataPermission(privilegeId);
|
|
|
+ }else {
|
|
|
+ dpr = basicRoleDataPermissionService.findDataPermission();
|
|
|
+ }
|
|
|
+ String[] status = {PrintPlanStatusEnum.NEW.name(), PrintPlanStatusEnum.READY.name()};
|
|
|
list = this.baseMapper.list(schoolId, source, module, status, dpr);
|
|
|
}
|
|
|
return list;
|