From edd5538d55e5f15244fc649f576fae0cd78aa670 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 29 Jul 2022 17:10:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87category?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/heart/IcCommunitySelfOrganizationDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml index b374071590..57b7dc3449 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml @@ -13,7 +13,8 @@ ifnull(PRINCIPAL_PHONE,'') AS mobile, ifnull(ADDRESS,'') as address, ifnull(LONGITUDE,'') as longitude, - ifnull(LATITUDE,'') as latitude + ifnull(LATITUDE,'') as latitude, + IFNULL(CATEGORY_CODE,'') as category FROM ic_community_self_organization WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} From 6135774ea255370161aa93e78e29c19b766c35f5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 29 Jul 2022 17:34:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/DepartmentServiceImpl.java | 4 ++++ .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index 0793688b22..dbc9be392b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -408,6 +408,8 @@ public class DepartmentServiceImpl implements DepartmentService { deptDTO.setDepartmentName(formDTO.getDeptName()); deptDTO.setDeptType(formDTO.getDeptType()); deptDTO.setTotalUser(1); + deptDTO.setContacts(formDTO.getPersonName()); + deptDTO.setMobile(formDTO.getMobile()); Result deptResult = addDepartment(deptDTO); //三、新增组织人员关系数据 //人员机关关系表 @@ -470,6 +472,8 @@ public class DepartmentServiceImpl implements DepartmentService { deptDTO.setDepartmentName(formDTO.getDeptName()); deptDTO.setDeptType(formDTO.getDeptType()); deptDTO.setTotalUser(1); + deptDTO.setContacts(formDTO.getPersonName()); + deptDTO.setMobile(formDTO.getMobile()); Result deptResult = addDepartment(deptDTO); //三、部门下新增人员关系数据 CustomerStaffDepartmentEntity dept = new CustomerStaffDepartmentEntity(); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 8fcc9b5338..3a10aa1b26 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -894,9 +894,17 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl newRoles = new ArrayList<>(); newRoles.add(resultRole.getData().getId()); + fromDTO.setNewRoles(newRoles); //3.新增工作人员 Result result = addStaff(fromDTO); + + //4.新增数字平台角色信息 + Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), fromDTO.getStaffId(), fromDTO.getCustomerId())); + if (!roleUserAccess.success()) { + throw new RenException("工作人员新增数字平台角色信息失败" + resultRole.getMsg()); + } + return result; }