Explorar el Código

报表,edi列表权限修改

纪新园 hace 10 meses
padre
commit
6c50f44168

+ 2 - 2
blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/controller/ReportsController.java

@@ -106,8 +106,8 @@ public class ReportsController extends BladeController {
 					text.append("find_in_set('").append(arrPost[i]).append("',authorized_team_id) or ");
 				}
 			}
-			text.append("find_in_set('").append(AuthUtil.getUserId()).append("',authorized_users_id))  ");
-			text.append("and not find_in_set('").append(AuthUtil.getUserId()).append("',exclude_users_id)");
+			text.append("find_in_set('").append(AuthUtil.getUserId()).append("',authorized_users_id) or  ");
+			text.append(" not find_in_set('").append(AuthUtil.getUserId()).append("',exclude_users_id))");
 			lambdaQueryWrapper.apply(text.toString());
 		}
 		IPage<Reports> pages = reportsService.page(Condition.getPage(query), lambdaQueryWrapper);

+ 2 - 2
blade-service/blade-los/src/main/java/org/springblade/los/edi/controller/EdiTypesController.java

@@ -99,8 +99,8 @@ public class EdiTypesController extends BladeController {
 					text.append("find_in_set('").append(arrPost[i]).append("',teamlist) or ");
 				}
 			}
-			text.append("find_in_set('").append(AuthUtil.getUserId()).append("',userlist))  ");
-			text.append("and not find_in_set('").append(AuthUtil.getUserId()).append("',excludelist)");
+			text.append("find_in_set('").append(AuthUtil.getUserId()).append("',userlist) or ");
+			text.append(" not find_in_set('").append(AuthUtil.getUserId()).append("',excludelist))");
 			lambdaQueryWrapper.apply(text.toString());
 		}
 		IPage<EdiTypes> pages = ediTypesService.page(Condition.getPage(query), Condition.getQueryWrapper(ediTypes));