diff --git a/src/main/java/com/zcloud/controller/openApi/OpenApiController.java b/src/main/java/com/zcloud/controller/openApi/OpenApiController.java index 841f5464..dcb1e989 100644 --- a/src/main/java/com/zcloud/controller/openApi/OpenApiController.java +++ b/src/main/java/com/zcloud/controller/openApi/OpenApiController.java @@ -82,6 +82,28 @@ public class OpenApiController extends BaseController { return map; } + @RequestMapping(value="/user/getUserInfo") + @ResponseBody + public Object getUserInfo() throws Exception{ + PageData map = new PageData(); + PageData pd = this.getPageData(); + PageData userInfo = usersService.getUserInfo(pd); //列出Post列表 + map.putAll(userInfo); + map.put("result", "success"); + return map; + } + + @RequestMapping(value="/department/getDepartmentInfo") + @ResponseBody + public Object getDepartmentInfo() throws Exception{ + PageData map = new PageData(); + PageData pd = this.getPageData(); + PageData departmentInfo = departmentService.getDepartmentInfo(pd); //列出Post列表 + map.putAll(departmentInfo); + map.put("result", "success"); + return map; + } + /**列表 * @throws Exception */ diff --git a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java index da0ee487..c35c14e6 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java @@ -173,5 +173,7 @@ public interface DepartmentMapper{ * @return */ List listTreeManageAndCorpForPcPunishThePerson(PageData pd); + + PageData getInfo(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java index 63de3eb8..198a7090 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -292,4 +292,6 @@ public interface UsersMapper { List selectUserListByUserIds(PageData pd); void resetCardNo(PageData pd); + + PageData getUserInfo(PageData pd); } diff --git a/src/main/java/com/zcloud/service/system/DepartmentService.java b/src/main/java/com/zcloud/service/system/DepartmentService.java index 61c7e0ba..b863fdab 100644 --- a/src/main/java/com/zcloud/service/system/DepartmentService.java +++ b/src/main/java/com/zcloud/service/system/DepartmentService.java @@ -223,5 +223,7 @@ public interface DepartmentService{ List listTreeManageAndCorp1(PageData pd)throws Exception; List listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception; + + PageData getDepartmentInfo(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 74747c24..eb3c9194 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -343,4 +343,6 @@ public interface UsersService { List selectUserListByUserIds(PageData selectPageData); void resetCardNo(PageData pd); + + PageData getUserInfo(PageData pd); } diff --git a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java index 7d631fdd..7ed7767a 100644 --- a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java @@ -409,5 +409,10 @@ public class DepartmentServiceImpl implements DepartmentService{ public List listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception { return departmentMapper.listTreeManageAndCorpForPcPunishThePerson(pd); } + + @Override + public PageData getDepartmentInfo(PageData pd) throws Exception { + return departmentMapper.getInfo(pd); + } } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index 9bec3e26..62bd107b 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -434,4 +434,9 @@ public class UsersServiceImpl implements UsersService { public void resetCardNo(PageData pd) { usersMapper.resetCardNo(pd); } + + @Override + public PageData getUserInfo(PageData pd) { + return usersMapper.getUserInfo(pd); + } } diff --git a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml index 1f8157e8..f4ffc72b 100644 --- a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml @@ -550,4 +550,7 @@ + diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 52653c68..c2b10336 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1287,4 +1287,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +