diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartRelevanceController.java b/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartRelevanceController.java index 7914414f..cd3cd1d6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartRelevanceController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartRelevanceController.java @@ -102,7 +102,7 @@ public class LawsPartRelevanceController { @AutoLog(value = "业务支持-关键零部件绑定关系管理-批量删除") @ApiOperation(value = "业务支持-关键零部件绑定关系管理-批量删除", notes = "业务支持-关键零部件绑定关系管理-批量删除") @ApiOperationSupport(order = 4) -// @PostMapping(value = "/deleteBatch") + @PostMapping(value = "/deleteBatch") // @RequiresPermissions("marketStandard:deleteBatch") public Result deleteBatch(@RequestBody Map map) { if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) { @@ -155,7 +155,7 @@ public class LawsPartRelevanceController { @ApiOperation(value = "业务支持-关键零部件绑定关系管理-导入", notes = "业务支持-关键零部件绑定关系管理-导入") @ApiOperationSupport(order = 7) @PostMapping(value = "/importExcel") - @RequiresPermissions("marketStandard:detail:operate") +// @RequiresPermissions("marketStandard:detail:operate") public Result importExcel(@RequestParam("file") @ApiParam("文件") MultipartFile file) { lawsPartRelevanceService.importExcel(file); return Result.OK(ResultCommon.OK); @@ -171,7 +171,7 @@ public class LawsPartRelevanceController { @ApiOperation(value = "业务支持-关键零部件绑定关系管理-下载模版", notes = "业务支持-关键零部件绑定关系管理-下载模版") @ApiOperationSupport(order = 7) @GetMapping(value = "/downloadTemplate") - @RequiresPermissions("marketStandard:detail:operate") +// @RequiresPermissions("marketStandard:detail:operate") public ModelAndView downloadTemplate(HttpServletResponse response) { return lawsPartRelevanceService.downloadTemplate(response); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartRelevance.java b/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartRelevance.java index 0cdbce2f..fb4eb8ff 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartRelevance.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartRelevance.java @@ -118,7 +118,7 @@ public class LawsPartRelevance implements Serializable { @NotBlank(message = "责任部门不能为空") @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "责任部门") - @Excel(name = "适用市场", width = 15, dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") + @Excel(name = "责任部门", width = 15, dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") private String responsibleDepartment; /** * 责任部门专业模块 @@ -126,7 +126,7 @@ public class LawsPartRelevance implements Serializable { @NotBlank(message = "责任部门专业模块不能为空") @ApiModelProperty(value = "责任部门专业模块") @Dict(dicCode = "responsible_module") - @Excel(name = "适用市场", width = 15, dicCode = "responsible_module") + @Excel(name = "责任部门专业模块", width = 15, dicCode = "responsible_module") private String responsibleModule; /** * 备注 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java index c9d2dde9..c389ce9a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java @@ -18,6 +18,7 @@ import com.jero.modules.laws.part.mapper.LawsPartRelevanceMapper; import com.jero.modules.laws.part.service.ILawsPartPmmPartitionInfoService; import com.jero.modules.laws.part.service.ILawsPartRelevanceService; import com.jero.modules.laws.utils.ValidUtil; +import com.jero.modules.system.vo.SysDictPage; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -251,10 +252,9 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl()); return mv; } }