|
@@ -82,7 +82,7 @@ public class YzCirculationCardController {
|
|
|
boolean isadmin=false;
|
|
|
QueryWrapper queryWrapper = null;
|
|
|
for (RoleDTO aa:list) {
|
|
|
- if(aa.getName().equals("租户管理员")||aa.getName().equals("管理员")||aa.getName().equals("办公室管理员")){
|
|
|
+ if(aa.getName().equals("租户管理员")||aa.getName().equals("管理员")){
|
|
|
isadmin=true;
|
|
|
}
|
|
|
}
|
|
@@ -92,17 +92,18 @@ public class YzCirculationCardController {
|
|
|
}else {
|
|
|
yzCirculationCardDTO.setState("");
|
|
|
queryWrapper = QueryWrapperGenerator.buildQueryCondition (yzCirculationCardDTO, YzCirculationCardDTO.class);
|
|
|
- //状态:1待办,2暂存,3归档,4已办,
|
|
|
- //5查看所有
|
|
|
- if(state!=null&&!state.equals("null")&&!state.equals("")){
|
|
|
- //1待办
|
|
|
- if(state.equals("1")){
|
|
|
- queryWrapper.eq ("b.state", "1" );
|
|
|
- }
|
|
|
- //4已办,根据流程上来
|
|
|
- else if(state.equals("4")){
|
|
|
- queryWrapper.eq ("b.state", "0" );
|
|
|
- }
|
|
|
+
|
|
|
+ }
|
|
|
+ //状态:1待办,2暂存,3归档,4已办,
|
|
|
+ //5查看所有
|
|
|
+ if(state!=null&&!state.equals("null")&&!state.equals("")){
|
|
|
+ //1待办
|
|
|
+ if(state.equals("1")){
|
|
|
+ queryWrapper.eq ("b.state", "1" );
|
|
|
+ }
|
|
|
+ //4已办,根据流程上来
|
|
|
+ else if(state.equals("4")){
|
|
|
+ queryWrapper.eq ("b.state", "0" );
|
|
|
}
|
|
|
}
|
|
|
queryWrapper.eq ("a.del_flag", 0 ); // 排除已经删除
|