Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -344,7 +344,7 @@ public class CorpsDescController extends BladeController {
 		}
 		if (Func.isNotEmpty(corpsDesc.getAdminProfiles())) {
 			lambdaQueryWrapper.and(i -> i.like(CorpsDesc::getAdminProfiles, corpsDesc.getAdminProfiles()).or().eq(CorpsDesc::getAdminProfiles, ' ')
-			.isNull(CorpsDesc::getAdminProfiles));
+				.or().isNull(CorpsDesc::getAdminProfiles));
 		}
 		if (StringUtils.isNotBlank(corpsDesc.getBelongtocompany())) {
 			lambdaQueryWrapper.and(i -> i.eq(CorpsDesc::getBelongtocompany, corpsDesc.getBelongtocompany()).or().isNull(CorpsDesc::getBelongtocompany));