diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index a6f651b3d..d35590f6f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -114,18 +114,17 @@ public class ExtRepoDataController extends JeroController add(@Validated @RequestBody ExtRepoData extRepoData, - @RequestParam("cut") String cut) { + public Result add(@Validated @RequestBody ExtRepoData extRepoData) { if (extRepoFolderService.haveManageAuth(extRepoData.getSupFolder())) { log.info("对外报告数据表收到文件添加请求,开始处理文件:【" + sdf.format(new Date()) + "】"); int res = extRepoDataService.add(extRepoData); - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoData.getCut())) { return Result.OK("添加成功:" + res + "条数据!"); } else { return Result.OK("success:" + res + "data!"); } } else { - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoData.getCut())) { return Result.error("没有权限!"); } else { return Result.error("No Permission!"); @@ -143,20 +142,19 @@ public class ExtRepoDataController extends JeroController edit(@Validated @RequestBody ExtRepoData extRepoData, - @RequestParam("cut") String cut) { + public Result edit(@Validated @RequestBody ExtRepoData extRepoData) { ExtRepoData erd = extRepoDataService.queryById(extRepoData.getId()); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (extRepoFolderService.isManager() || sysUser.getUsername().equals(erd.getCreateBy())) { extRepoData.setSupFolder(erd.getSupFolder()); extRepoDataService.editById(extRepoData); - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoData.getCut())) { return Result.OK("添加成功!"); } else { return Result.OK("success!"); } } else { - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoData.getCut())) { return Result.error("没有权限!"); } else { return Result.error("No Permission!"); @@ -174,7 +172,7 @@ public class ExtRepoDataController extends JeroController delete(@RequestParam("id") String id, - @RequestParam("cut") String cut) { + @RequestParam(name = "cut", defaultValue = "cn") String cut) { ExtRepoData erd = extRepoDataService.queryById(id); if (null != erd) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -207,7 +205,7 @@ public class ExtRepoDataController extends JeroController deleteBatch(@RequestParam("ids") String ids, - @RequestParam("cut") String cut) { + @RequestParam(name = "cut", defaultValue = "cn") String cut) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List idsList = Arrays.asList(ids.split(",")); for (String id : idsList) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java index 8c0caae2c..556a139a9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java @@ -53,17 +53,16 @@ public class ExtRepoFolderController extends JeroController add(@Validated @RequestBody ExtRepoFolder extRepoFolder, - @RequestParam("cut") String cut) { + public Result add(@Validated @RequestBody ExtRepoFolder extRepoFolder) { if (extRepoFolderService.haveManageAuth(extRepoFolder.getSupFolder())) { extRepoFolderService.add(extRepoFolder); - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoFolder.getCut())) { return Result.OK("添加成功!"); } else { return Result.OK("success!"); } } else { - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoFolder.getCut())) { return Result.error("没有权限!"); } else { return Result.error("No Permission!"); @@ -80,17 +79,16 @@ public class ExtRepoFolderController extends JeroController edit(@Validated @RequestBody ExtRepoFolder extRepoFolder, - @RequestParam("cut") String cut) { + public Result edit(@Validated @RequestBody ExtRepoFolder extRepoFolder) { if (extRepoFolderService.haveManageAuth(extRepoFolder.getId())) { extRepoFolderService.editById(extRepoFolder); - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoFolder.getCut())) { return Result.OK("编辑成功!"); } else { return Result.OK("success!"); } } else { - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoFolder.getCut())) { return Result.error("没有权限!"); } else { return Result.error("No Permission!"); @@ -108,7 +106,7 @@ public class ExtRepoFolderController extends JeroController delete(@RequestParam(name = "id", required = true) String id, - @RequestParam("cut") String cut) { + @RequestParam(name = "cut", defaultValue = "cn") String cut) { if (extRepoFolderService.haveManageAuth(id)) { List resList = extRepoFolderService.getListBySupFolder(id); if (resList.isEmpty()) { @@ -144,7 +142,7 @@ public class ExtRepoFolderController extends JeroController queryById(@RequestParam(name = "id", required = true) String id, - @RequestParam("cut") String cut) { + @RequestParam(name = "cut", defaultValue = "cn") String cut) { ExtRepoFolder extRepoFolder = extRepoFolderService.queryById(id); if (extRepoFolder == null) { if (CutEnum.CN.getValue().equals(cut)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java index 60b13fee3..d83dc65a2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java @@ -1,6 +1,7 @@ package com.jero.modules.extRepo.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -78,4 +79,7 @@ public class ExtRepoData implements Serializable { @ApiModelProperty(value = "所属文件夹") private java.lang.String supFolder; + @TableField(exist = false) + private String cut; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java index 972a8010d..c34293c87 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java @@ -1,6 +1,7 @@ package com.jero.modules.extRepo.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -92,4 +93,7 @@ public class ExtRepoFolder implements Serializable { @Excel(name = "管理权限人员id", width = 15) @ApiModelProperty(value = "管理权限人员id") private String authManageIds; + + @TableField(exist = false) + private String cut; }