diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/FilesClassifyMarkController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FilesClassifyMarkController.java
index 613e3a8..6653f4e 100644
--- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/FilesClassifyMarkController.java
+++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FilesClassifyMarkController.java
@@ -11,6 +11,7 @@ import com.bonus.web.service.FilesClassifyMarkService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -48,7 +49,7 @@ public class FilesClassifyMarkController extends BaseController {
@PostMapping("addArchivalCatalogue")
@SysLog(title = "文件分类标记新增", module = "档案分类管理->文件分类标记管理", businessType = OperaType.INSERT, details = "文件分类标记新增", logType = 1)
@RequiresPermissions("files:classify:add")
- public R addArchivalCatalogueTree(@RequestBody FilesClassifyMarkDto dto) {
+ public R addArchivalCatalogueTree(@RequestBody @Validated FilesClassifyMarkDto dto) {
try {
Integer i = service.add(dto);
if (i > 0) {
@@ -65,7 +66,7 @@ public class FilesClassifyMarkController extends BaseController {
@PostMapping("editArchivalCatalogue")
@SysLog(title = "文件分类标记修改", module = "档案分类管理->文件分类标记管理", businessType = OperaType.UPDATE, details = "文件分类标记修改", logType = 1)
@RequiresPermissions("files:classify:edit")
- public R editArchivalCatalogueTree(@RequestBody FilesClassifyMarkDto dto) {
+ public R editArchivalCatalogueTree(@RequestBody @Validated FilesClassifyMarkDto dto) {
try {
Integer i = service.edit(dto);
if (i > 0) {
diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/FilesClassifyMarkDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/FilesClassifyMarkDto.java
index 7d00784..19f875b 100644
--- a/bonus-admin/src/main/java/com/bonus/web/domain/FilesClassifyMarkDto.java
+++ b/bonus-admin/src/main/java/com/bonus/web/domain/FilesClassifyMarkDto.java
@@ -1,6 +1,9 @@
package com.bonus.web.domain;
import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
/**
* @Author:liang.chao
@@ -9,7 +12,10 @@ import lombok.Data;
@Data
public class FilesClassifyMarkDto {
private String id;
+ @NotBlank(message = "分类标记名称不能为空")
+ @Length(max = 20, message = "分类标记名称长度不能超过20个字符")
private String classifyMarkName;
+ @Length(max = 200, message = "备注不能超过200个字符")
private String remark;
private String createTime;
private String updateTime;
diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/FilesClassifyMarkServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/FilesClassifyMarkServiceImpl.java
index 2d2ffef..9510007 100644
--- a/bonus-admin/src/main/java/com/bonus/web/service/impl/FilesClassifyMarkServiceImpl.java
+++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/FilesClassifyMarkServiceImpl.java
@@ -29,6 +29,8 @@ public class FilesClassifyMarkServiceImpl implements FilesClassifyMarkService {
public Integer add(FilesClassifyMarkDto dto) {
dto.setCreateUserId(getLoginUser().getUserId().toString());
dto.setCreateUserName(getLoginUser().getUsername());
+ dto.setUpdateUserId(getLoginUser().getUserId().toString());
+ dto.setUpdateUserName(getLoginUser().getUsername());
return filesClassifyMarkMapper.add(dto);
}
diff --git a/bonus-admin/src/main/resources/mapper/FilesClassifyMarkMapper.xml b/bonus-admin/src/main/resources/mapper/FilesClassifyMarkMapper.xml
index 4003f34..617d567 100644
--- a/bonus-admin/src/main/resources/mapper/FilesClassifyMarkMapper.xml
+++ b/bonus-admin/src/main/resources/mapper/FilesClassifyMarkMapper.xml
@@ -31,6 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_user_id = #{updateUserId},
update_user_name = #{updateUserName},
+ WHERE
+ id = #{id}
DELETE FROM da_ky_files_classify_mark