|
@@ -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);
|
|
|
-
|
|
|
-
|
|
|
- if(state!=null&&!state.equals("null")&&!state.equals("")){
|
|
|
-
|
|
|
- if(state.equals("1")){
|
|
|
- queryWrapper.eq ("b.state", "1" );
|
|
|
- }
|
|
|
-
|
|
|
- else if(state.equals("4")){
|
|
|
- queryWrapper.eq ("b.state", "0" );
|
|
|
- }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ if(state!=null&&!state.equals("null")&&!state.equals("")){
|
|
|
+
|
|
|
+ if(state.equals("1")){
|
|
|
+ queryWrapper.eq ("b.state", "1" );
|
|
|
+ }
|
|
|
+
|
|
|
+ else if(state.equals("4")){
|
|
|
+ queryWrapper.eq ("b.state", "0" );
|
|
|
}
|
|
|
}
|
|
|
queryWrapper.eq ("a.del_flag", 0 );
|