From a0ae0afef6b304fbe008bf1cd7edc9b7115db22a Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 16 Jan 2024 17:19:04 +0800
Subject: [PATCH] 数据库配置
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
index 82b2d36..21a8e68 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -131,15 +131,14 @@
/**
* 员工列表 不分页
- * @param query
* @param user
* @return
*/
@GetMapping("/userListBy")
@ApiOperation(value = "分页", notes = "传入user")
- public R<List<UserVO>> userListBy(Query query,User user) {
+ public R<List<UserVO>> userListBy(User user) {
QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user);
- List<User> list = userService.list(Condition.getPage(query), queryWrapper);
+ List<User> list = userService.list(queryWrapper);
return R.data(UserWrapper.build().listVO(list));
}
@@ -181,7 +180,7 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入evaluateTask")
public R submit(@Valid @RequestBody EvaluateTaskEntity evaluateTask) {
- if (DateUtils.isToday(evaluateTask.getEvaluateCutoffTimeStart())) {//是否今天开始
+ if (null != evaluateTask.getEvaluateCutoffTimeStart() && DateUtils.isToday(evaluateTask.getEvaluateCutoffTimeStart())) {//是否今天开始
evaluateTask.setEvaluateState(1);
}
return R.status(evaluateTaskService.saveOrUpdate(evaluateTask));
--
Gitblit v1.9.3