Commit 7a515b90 authored by wzp's avatar wzp

修改bug

parent a746ae47
...@@ -119,4 +119,12 @@ public class Audit implements Serializable { ...@@ -119,4 +119,12 @@ public class Audit implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String auditName; private String auditName;
@TableField(exist = false)
private Boolean one;
@TableField(exist = false)
private Boolean two;
} }
...@@ -65,6 +65,8 @@ public class AuditController extends BaseController { ...@@ -65,6 +65,8 @@ public class AuditController extends BaseController {
@MethodLog(operModule = OperModule.RECHECK, operType = OperType.SELECT) @MethodLog(operModule = OperModule.RECHECK, operType = OperType.SELECT)
public Map<String, Object> getUserList(String name, String status, String level) { public Map<String, Object> getUserList(String name, String status, String level) {
Page<Audit> auditList; Page<Audit> auditList;
Boolean one = true;
Boolean two = true;
try { try {
TUser user1 = getcurUser(); TUser user1 = getcurUser();
TUser user = new TUser(); TUser user = new TUser();
...@@ -81,8 +83,16 @@ public class AuditController extends BaseController { ...@@ -81,8 +83,16 @@ public class AuditController extends BaseController {
if (!user1.getRoleList().contains("1")) { if (!user1.getRoleList().contains("1")) {
if (user1.getRoleList().contains("15")) { if (user1.getRoleList().contains("15")) {
user.setAuditStatus(AuditStatusEnum.TBC.name()); user.setAuditStatus(AuditStatusEnum.TBC.name());
one = true;
if (user.getRoleList().contains("16")) {
two = true;
}
} else if (user1.getRoleList().contains("16")) { } else if (user1.getRoleList().contains("16")) {
user.setAuditStatus(AuditStatusEnum.TBCA.name()); user.setAuditStatus(AuditStatusEnum.TBCA.name());
two = true;
if (user.getRoleList().contains("15")) {
one = true;
}
} else { } else {
//不存在的层级 //不存在的层级
user.setAuditStatus("1"); user.setAuditStatus("1");
...@@ -90,6 +100,10 @@ public class AuditController extends BaseController { ...@@ -90,6 +100,10 @@ public class AuditController extends BaseController {
} }
user.setId(user1.getId()); user.setId(user1.getId());
auditList = auditService.getUserList(getPage(), user); auditList = auditService.getUserList(getPage(), user);
for (Audit record : auditList.getRecords()) {
record.setOne(one);
record.setTwo(two);
}
return getResult(auditList); return getResult(auditList);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -230,15 +244,28 @@ public class AuditController extends BaseController { ...@@ -230,15 +244,28 @@ public class AuditController extends BaseController {
AuditStatusEnum auditStatus = null; AuditStatusEnum auditStatus = null;
AuditStatusEnum auditStatusLevel = null; AuditStatusEnum auditStatusLevel = null;
AuditTypeEnum auditTypeEnum = AuditTypeEnum.valueOf(type); AuditTypeEnum auditTypeEnum = AuditTypeEnum.valueOf(type);
Boolean one = true;
Boolean two = true;
//数据权限,暂时注释 //数据权限,暂时注释
TUser user = getcurUser(); TUser user = getcurUser();
if (!user.getRoleList().contains("1")) { if (!user.getRoleList().contains("1")) {
one = false;
two = false;
switch (auditTypeEnum) { switch (auditTypeEnum) {
case VIDEO_CONTENT: case VIDEO_CONTENT:
if (user.getRoleList().contains("9")) { if (user.getRoleList().contains("9")) {
auditStatusLevel = AuditStatusEnum.TBC; auditStatusLevel = AuditStatusEnum.TBC;
one = true;
if (user.getRoleList().contains("10")) {
two = true;
}
} else if (user.getRoleList().contains("10")) { } else if (user.getRoleList().contains("10")) {
auditStatusLevel = AuditStatusEnum.TBCA; auditStatusLevel = AuditStatusEnum.TBCA;
two = true;
auditStatusLevel = AuditStatusEnum.TBC;
if (user.getRoleList().contains("9")) {
one = true;
}
} else { } else {
auditStatusLevel = AuditStatusEnum.APPROVED_FINAL; auditStatusLevel = AuditStatusEnum.APPROVED_FINAL;
} }
...@@ -246,8 +273,17 @@ public class AuditController extends BaseController { ...@@ -246,8 +273,17 @@ public class AuditController extends BaseController {
case EXHIBITION_BOARD: case EXHIBITION_BOARD:
if (user.getRoleList().contains("11")) { if (user.getRoleList().contains("11")) {
auditStatusLevel = AuditStatusEnum.TBC; auditStatusLevel = AuditStatusEnum.TBC;
one = true;
if (user.getRoleList().contains("12")) {
two = true;
}
} else if (user.getRoleList().contains("12")) { } else if (user.getRoleList().contains("12")) {
auditStatusLevel = AuditStatusEnum.TBCA; auditStatusLevel = AuditStatusEnum.TBCA;
two = true;
auditStatusLevel = AuditStatusEnum.TBC;
if (user.getRoleList().contains("11")) {
one = true;
}
} else { } else {
auditStatusLevel = AuditStatusEnum.APPROVED_FINAL; auditStatusLevel = AuditStatusEnum.APPROVED_FINAL;
} }
...@@ -255,8 +291,17 @@ public class AuditController extends BaseController { ...@@ -255,8 +291,17 @@ public class AuditController extends BaseController {
case LEARNING_CONTENT: case LEARNING_CONTENT:
if (user.getRoleList().contains("13")) { if (user.getRoleList().contains("13")) {
auditStatusLevel = AuditStatusEnum.TBC; auditStatusLevel = AuditStatusEnum.TBC;
one = true;
if (user.getRoleList().contains("14")) {
two = true;
}
} else if (user.getRoleList().contains("14")) { } else if (user.getRoleList().contains("14")) {
auditStatusLevel = AuditStatusEnum.TBCA; auditStatusLevel = AuditStatusEnum.TBCA;
two = true;
auditStatusLevel = AuditStatusEnum.TBC;
if (user.getRoleList().contains("13")) {
one = true;
}
} else { } else {
auditStatusLevel = AuditStatusEnum.APPROVED_FINAL; auditStatusLevel = AuditStatusEnum.APPROVED_FINAL;
} }
...@@ -267,8 +312,11 @@ public class AuditController extends BaseController { ...@@ -267,8 +312,11 @@ public class AuditController extends BaseController {
auditStatus = AuditStatusEnum.valueOf(status); auditStatus = AuditStatusEnum.valueOf(status);
} }
try { try {
Page<Audit> auditList = auditService.pageList(name, auditStatus, auditStatusLevel, auditTypeEnum, getPage(), user.getId()); Page<Audit> auditList = auditService.pageList(name, auditStatus, auditStatusLevel, auditTypeEnum, getPage(), user.getId());
for (Audit record : auditList.getRecords()) {
record.setOne(one);
record.setTwo(two);
}
return getResult(auditList); return getResult(auditList);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment