diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDeptDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDeptDTO.java new file mode 100644 index 000000000..e0f16ca82 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDeptDTO.java @@ -0,0 +1,38 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有,侵权必究! + */ + +package com.elink.esua.epdc.dto; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.io.Serializable; + +/** + * 简要部门信息 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Data +@ApiModel(value = "部门管理") +public class SysSimpleDeptDTO implements Serializable { + + private static final long serialVersionUID = -6055457020846692183L; + + /** + * 部门ID + */ + private Long id; + + /** + * 部门名称 + */ + private String name; + +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 223bae618..edbeae0bf 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -84,7 +84,7 @@ dev - true + false 47.104.224.45:8848 http://localhost:9411 diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AreaController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AreaController.java index 13bb88cbd..8ab8ed67a 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AreaController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AreaController.java @@ -1,16 +1,16 @@ package com.elink.esua.epdc.controller; +import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.SimpleAreaDTO; +import com.elink.esua.epdc.dto.SysSimpleDeptDTO; import com.elink.esua.epdc.service.AreaService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** @@ -39,4 +39,17 @@ public class AreaController { return this.areaService.listSimpleAreaInfo(areaId); } + /** + * 数据权限控制用户可操作的部门(用于下拉菜单显示) + * + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author yujintao + * @date 2019/9/4 19:21 + */ + @GetMapping("listSimpleDept") + @DataFilter(tableAlias = "temp", deptId = "id", prefix = "WHERE") + public Result> listSimpleDeptInfo(@RequestParam Map params) { + return this.areaService.listSimpleDeptInfo(params); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java index c16eb1e83..695c22b2c 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java @@ -8,9 +8,9 @@ package com.elink.esua.epdc.dao; +import com.elink.esua.epdc.dto.SysSimpleDeptDTO; import com.elink.esua.epdc.entity.SysDeptEntity; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.entity.SysDeptEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -41,4 +41,15 @@ public interface SysDeptDao extends BaseDao { List getSubDeptIdList(String id); List getSubList(Map params); + + /** + * 根据上级部门ID,获取下属部门简要信息列表 + * + * @param params 父部门ID + * @return java.util.List < com.elink.esua.epdc.dto.SysSimpleDeptDTO> + * @author yujintao + * @date 2019/9/4 16:21 + */ + List listSimpleDeptInfo(Map params); + } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/AreaService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/AreaService.java index 72a0ce258..b5a8e0159 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/AreaService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/AreaService.java @@ -4,9 +4,11 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.SimpleAreaDTO; +import com.elink.esua.epdc.dto.SysSimpleDeptDTO; import com.elink.esua.epdc.entity.AreaEntity; import java.util.List; +import java.util.Map; /** * 行政区划 @@ -26,4 +28,14 @@ public interface AreaService extends BaseService { * @date 2019/6/13 10:35 */ Result> listSimpleAreaInfo(String areaId); + + /** + * 根据上级部门ID,获取下属部门简要信息列表 + * + * @param params 父部门ID + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author yujintao + * @date 2019/9/4 16:21 + */ + Result> listSimpleDeptInfo(Map params); } \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AreaServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AreaServiceImpl.java index 7bf4a8b76..8432d45a8 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AreaServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AreaServiceImpl.java @@ -7,7 +7,9 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.AreaDao; +import com.elink.esua.epdc.dao.SysDeptDao; import com.elink.esua.epdc.dto.SimpleAreaDTO; +import com.elink.esua.epdc.dto.SysSimpleDeptDTO; import com.elink.esua.epdc.entity.AreaEntity; import com.elink.esua.epdc.redis.AreaRedis; import com.elink.esua.epdc.service.AreaService; @@ -18,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** @@ -32,6 +35,10 @@ public class AreaServiceImpl extends BaseServiceImpl implem @Autowired private AreaRedis areaRedis; + @Autowired + private SysDeptDao deptDao; + + @Override public Result> listSimpleAreaInfo(String areaId) { @@ -62,4 +69,12 @@ public class AreaServiceImpl extends BaseServiceImpl implem } return new Result>().ok(simpleAreaList); } + + @Override + public Result> listSimpleDeptInfo(Map params) { + + List sysSimpleDeptS = this.deptDao.listSimpleDeptInfo(params); + + return new Result().ok(sysSimpleDeptS); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml index 336e39112..dc5e9d705 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml @@ -31,4 +31,12 @@ + + +