|
@@ -32,6 +32,7 @@ import org.springblade.client.vo.MessageVO;
|
|
|
import org.springblade.core.boot.ctrl.BladeController;
|
|
import org.springblade.core.boot.ctrl.BladeController;
|
|
|
import org.springblade.core.mp.support.Condition;
|
|
import org.springblade.core.mp.support.Condition;
|
|
|
import org.springblade.core.mp.support.Query;
|
|
import org.springblade.core.mp.support.Query;
|
|
|
|
|
+import org.springblade.core.secure.BladeUser;
|
|
|
import org.springblade.core.secure.utils.AuthUtil;
|
|
import org.springblade.core.secure.utils.AuthUtil;
|
|
|
import org.springblade.core.tool.api.R;
|
|
import org.springblade.core.tool.api.R;
|
|
|
import org.springblade.core.tool.utils.Func;
|
|
import org.springblade.core.tool.utils.Func;
|
|
@@ -40,6 +41,7 @@ import org.springframework.web.bind.annotation.*;
|
|
|
import javax.validation.Valid;
|
|
import javax.validation.Valid;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 控制器
|
|
* 控制器
|
|
@@ -186,18 +188,20 @@ public class MessageController extends BladeController {
|
|
|
@ApiOperationSupport(order = 4)
|
|
@ApiOperationSupport(order = 4)
|
|
|
@ApiOperation(value = "新增", notes = "传入message")
|
|
@ApiOperation(value = "新增", notes = "传入message")
|
|
|
public R saveList(@Valid @RequestBody List<Message> messageList) {
|
|
public R saveList(@Valid @RequestBody List<Message> messageList) {
|
|
|
- for (Message message :messageList){
|
|
|
|
|
- if (message.getUserId() == null) {
|
|
|
|
|
- message.setUserId(AuthUtil.getUserId());
|
|
|
|
|
|
|
+ BladeUser msgUser = AuthUtil.getUser();
|
|
|
|
|
+ Date nowDate = new Date();
|
|
|
|
|
+ for (Message message : messageList){
|
|
|
|
|
+ if (Objects.isNull(message.getUserId())) {
|
|
|
|
|
+ message.setUserId(msgUser.getUserId());
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isBlank(message.getUserName())) {
|
|
if (StringUtils.isBlank(message.getUserName())) {
|
|
|
- message.setUserName(AuthUtil.getUserName());
|
|
|
|
|
|
|
+ message.setUserName(msgUser.getUserName());
|
|
|
}
|
|
}
|
|
|
- if (ObjectUtils.isNull(message.getTenantId())){
|
|
|
|
|
- message.setTenantId(AuthUtil.getTenantId());
|
|
|
|
|
|
|
+ if (StringUtils.isBlank(message.getTenantId())){
|
|
|
|
|
+ message.setTenantId(msgUser.getTenantId());
|
|
|
}
|
|
}
|
|
|
- message.setCreateTime(new Date());
|
|
|
|
|
- message.setCreateUser(AuthUtil.getUserId());
|
|
|
|
|
|
|
+ message.setCreateTime(nowDate);
|
|
|
|
|
+ message.setCreateUser(msgUser.getUserId());
|
|
|
}
|
|
}
|
|
|
return R.status(messageService.saveBatch(messageList));
|
|
return R.status(messageService.saveBatch(messageList));
|
|
|
}
|
|
}
|