فهرست منبع

jms:1.增加团队查询全部接口
2.修改查询全部用户接口条件
3.调试并修改edi接口权限bug
4.调试并修改报表接口权限bug

纪新园 7 ماه پیش
والد
کامیت
ea000bf3ce

+ 14 - 0
blade-service/blade-system/src/main/java/org/springblade/system/controller/PostController.java

@@ -180,5 +180,19 @@ public class PostController extends BladeController {
 		return R.data(list);
 	}
 
+	/**
+	 * 查询全部
+	 */
+	@GetMapping("/listAll")
+	public R<List<Post>> listAll(Post post) {
+		LambdaQueryWrapper<Post> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(Post::getTenantId,AuthUtil.getTenantId())
+			.eq(Post::getIsDeleted,0)
+			.like(ObjectUtils.isNotNull(post.getPostName()),Post::getPostName,post.getPostName())
+			.like(ObjectUtils.isNotNull(post.getPostCode()),Post::getPostCode,post.getPostCode());
+		List<Post> list = postService.list(lambdaQueryWrapper);
+		return R.data(list);
+	}
+
 
 }

+ 1 - 0
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -542,6 +542,7 @@ public class UserController {
 		LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.like(StringUtils.isNotBlank(userVO.getRealName()), User::getRealName, userVO.getRealName())
 			.like(ObjectUtil.isNotEmpty(userVO.getDeptPid()), User::getDeptPid, userVO.getDeptPid())
+			.like(ObjectUtil.isNotEmpty(userVO.getRealName()), User::getRealName, userVO.getRealName())
 			.eq(User::getTenantId, AuthUtil.getTenantId())
 			.eq(User::getIsDeleted, 0);
 		if (StringUtil.isNotBlank(userVO.getRoleAlias())) {