Commit e40cf9a0 authored by wzp's avatar wzp

修改bug

parent f3d535dc
......@@ -72,7 +72,8 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
auditPage.setSize(page.getSize());
//条件
QueryWrapper<Audit> ew = new QueryWrapper<Audit>()
.eq("a.level", auditStatusLevel.name())
//暂时注掉
// .eq("a.level", auditStatusLevel.name())
.eq("a.type", type.name())
.orderByDesc("a.create_time", "a.id");
//
......
......@@ -228,10 +228,9 @@ public class AuditController extends BaseController {
@ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "name", value = "账号名称或提交人", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "status", value = "待初审:TBC, 驳回:REFUSED,待复审:TBCA, 通过:APPROVED_FINAL", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "level", value = "审核级别:TBC,TBCA", paramType = "query", dataType = "String", required = true),
@ApiImplicitParam(name = "type", value = "视频内容:ASSET,展板内容:EXHIBITION_BOARD,学习内容:LEARNING_CONTENT", paramType = "query", dataType = "String", required = true)
})
public Map<String, Object> getPageAllList(String name, String status, String level,
public Map<String, Object> getPageAllList(String name, String status,
@NotBlank(message = "type参数不能为空") String type) {
//分页
......@@ -240,32 +239,32 @@ public class AuditController extends BaseController {
AuditStatusEnum auditStatusLevel = null;
AuditTypeEnum auditTypeEnum = AuditTypeEnum.valueOf(type);
TUser user = getcurUser();
switch (auditTypeEnum){
case ASSET:
if (user.getRoleList().contains("9")){
auditStatusLevel=AuditStatusEnum.TBC;
}else {
auditStatusLevel=AuditStatusEnum.TBCA;
}
break;
case EXHIBITION_BOARD:
if (user.getRoleList().contains("11")){
auditStatusLevel=AuditStatusEnum.TBC;
}else {
auditStatusLevel=AuditStatusEnum.TBCA;
}
break;
case LEARNING_CONTENT:
if (user.getRoleList().contains("13")){
auditStatusLevel=AuditStatusEnum.TBC;
}else {
auditStatusLevel=AuditStatusEnum.TBCA;
}
break;
}
if (auditTypeEnum == null || auditStatusLevel == null) {
// TUser user = getcurUser();
// switch (auditTypeEnum){
// case ASSET:
// if (user.getRoleList().contains("9")){
// auditStatusLevel=AuditStatusEnum.TBC;
// }else {
// auditStatusLevel=AuditStatusEnum.TBCA;
// }
// break;
// case EXHIBITION_BOARD:
// if (user.getRoleList().contains("11")){
// auditStatusLevel=AuditStatusEnum.TBC;
// }else {
// auditStatusLevel=AuditStatusEnum.TBCA;
// }
// break;
// case LEARNING_CONTENT:
// if (user.getRoleList().contains("13")){
// auditStatusLevel=AuditStatusEnum.TBC;
// }else {
// auditStatusLevel=AuditStatusEnum.TBCA;
// }
// break;
//
// }
if (auditTypeEnum == null) {
return getFailResult("type参数不正确");
}
if (StringUtils.isNotBlank(status)) {
......
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