diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 0f3c738d8f..b53313b3e7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -644,6 +644,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { List list = staffRoleDao.selectByStaffId(staffId); //汇总数据 result = ConvertUtils.sourceToTarget(dto, StaffDetailV2FormDTO.class); + result.setStaffId(dto.getUserId()); result.setName(dto.getRealName()); result.setGender(dto.getGender().toString()); result.setRoles(list); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index bb6308fd11..963c8b7b95 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -302,4 +302,14 @@ public class CustomerAgencyController { public Result getAreaCodeSwitch(@PathVariable("customerId")String customerId){ return new Result().ok(customerOrgParameterService.getAreaCodeSwitch(customerId)); } + + /** + * @Description 【通讯录】查询当前人员所属组织、组织下部门/网格树 + * @author sun + **/ + @PostMapping("orgtree") + Result orgTree(@LoginUser TokenDto tokenDto){ + return new Result().ok(customerAgencyService.staffPermissionExt(tokenDto.getUserId())); + } + } \ No newline at end of file