FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-05 15:01:23 +08:00
Code Packages Releases Activity

Update addNotice component judge

Browse Source
This commit is contained in:
cccccyb
2023-05-06 14:15:42 +08:00
parent 107c3b9fbd
commit 3feee5345d
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java
View File

@@ -42,7 +42,6 @@ public class WorkController {
@GetMapping("/todo") @GetMapping("/todo")
public ResponseResult getTodo() { public ResponseResult getTodo() {
Long userId = WebUtil.getLoginUser().getUser().getId(); Long userId = WebUtil.getLoginUser().getUser().getId();
System.out.println(userId);
return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", workService.getTodo(userId)); return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", workService.getTodo(userId));
} }
@@ -65,13 +64,11 @@ public class WorkController {
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
public ResponseResult deleteById(@PathVariable Long id) { public ResponseResult deleteById(@PathVariable Long id) {
System.out.println(id);
return ResponseResult.build(ResponseCode.DATABASE_DELETE_OK, "success", workService.deleteByWorkId(id)); return ResponseResult.build(ResponseCode.DATABASE_DELETE_OK, "success", workService.deleteByWorkId(id));
} }
@PutMapping("/setStatus") @PutMapping("/setStatus")
public ResponseResult updateStatus(@RequestBody UserWork userWork) { public ResponseResult updateStatus(@RequestBody UserWork userWork) {
System.out.println(userWork);
userWork.setUserId(WebUtil.getLoginUser().getUser().getId()); userWork.setUserId(WebUtil.getLoginUser().getUser().getId());
return ResponseResult.build(ResponseCode.DATABASE_UPDATE_OK, "success", workService.updateStatus(userWork)); return ResponseResult.build(ResponseCode.DATABASE_UPDATE_OK, "success", workService.updateStatus(userWork));
} }

1
ui/src/assets/css/work/work.css
View File

@@ -5,7 +5,6 @@
display: flex; display: flex;
min-width: 600px; min-width: 600px;
min-height: 600px; min-height: 600px;
text-align: center;
} }
.main-table { .main-table {
position: relative; position: relative;

4
ui/src/components/notice/CommitForm.vue
View File

@@ -110,10 +110,10 @@ export default {
{ required: true, message: '请输入公告标题', trigger: 'blur' }, { required: true, message: '请输入公告标题', trigger: 'blur' },
{ min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' } { min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' }
], ],
type: [ typeId: [
{ type:'array',required: true, message: '请选择公告类型', trigger: 'change' } { type:'array',required: true, message: '请选择公告类型', trigger: 'change' }
], ],
startTime: [ sendTime: [
{ type: 'date', required: true, message: '请选择生效时间', trigger: 'change' } { type: 'date', required: true, message: '请选择生效时间', trigger: 'change' }
], ],
endTime: [ endTime: [