From 3513da53dffc309a81f6a24c70b90d0cd779c756 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 04 三月 2021 22:01:14 +0800
Subject: [PATCH] 提交
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java | 9 +++++++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java | 1 -
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java | 1 +
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java
index 3775104..ebfb517 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java
@@ -49,7 +49,6 @@
}
@PostMapping
- @PreAuthorize("hasAuthority('empAccessory:add')")
public void addEmpAccessory(@NotNull(message = "{required}") Long labelid,@NotNull(message = "{required}") Long empId, MultipartFile file) throws FebsException {
try {
this.empAccessoryService.createEmpAccessory(labelid,file,empId);
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java
index 9230eb5..9a93de2 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java
@@ -39,11 +39,16 @@
private final IDicService dicService;
@GetMapping
-@PreAuthorize("hasAuthority('dicitem:list')")
public FebsResponse getAllDicitems(DicItem dicitem) {
return new FebsResponse().data(dicitemService.findDicItems(dicitem));
}
-
+ @GetMapping(value = "/type/{dictType}")
+ public FebsResponse dictType(@PathVariable String dictType)
+ {
+ DicItem dicItem=new DicItem();
+ dicItem.setDicCode(dictType);
+ return new FebsResponse().data(dicitemService.findDicItems(dicItem));
+ }
@GetMapping("list")
public FebsResponse dicitemList(QueryRequest request, DicItem dicitem) {
Map<String, Object> dataTable = FebsUtil.getDataTable(this.dicitemService.findDicItems(request, dicitem));
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java
index 9f237fe..c63c8ce 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java
@@ -59,6 +59,7 @@
public List<DicItem> findDicItems(DicItem dicitem) {
LambdaQueryWrapper<DicItem> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DicItem::getDelFlag, 0);
+ queryWrapper.eq(DicItem::getDicCode,dicitem.getDicCode());
return this.baseMapper.selectList(queryWrapper);
}
--
Gitblit v1.8.0