diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/ProjectController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/ProjectController.java index c37a7ff..3ccfdd9 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/ProjectController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/ProjectController.java @@ -49,7 +49,6 @@ public class ProjectController extends BaseController { @ApiOperation(value = "档案目录下拉") @GetMapping("getFileCatalogSelect") @SysLog(title = "档案目录下拉", module = "档案管理->档案目录下拉", businessType = OperaType.QUERY, details = "档案目录下拉", logType = 1) - @RequiresPermissions("file:catalog:select") public AjaxResult getFileCatalogSelect(ArchivalCatalogueDto dto) { try { List list = service.getFileCatalogSelect(dto); diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java index 94a8d5d..48f301f 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java @@ -34,12 +34,12 @@ public class DaKyProFilesContentsDto { /** * 层级 */ - private String level; + private Integer level; /** * 分类号/案卷排序号 */ - private Long sort; + private Integer sort; /** * 档案标识代码 diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java index e654548..e918336 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.web.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.utils.bean.BeanUtils; import com.bonus.web.domain.ArchivalCatalogueDto; diff --git a/bonus-admin/src/main/resources/mapper/ProjectMapper.xml b/bonus-admin/src/main/resources/mapper/ProjectMapper.xml index 83031f2..37cde51 100644 --- a/bonus-admin/src/main/resources/mapper/ProjectMapper.xml +++ b/bonus-admin/src/main/resources/mapper/ProjectMapper.xml @@ -49,9 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UPDATE da_ky_project SET - content_name = #{contentsName} + contents_name = #{contentsName} WHERE - id = #{id} + id = #{proId}