Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage

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}

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<AddDepartmentResultDTO> 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<AddDepartmentResultDTO> deptResult = addDepartment(deptDTO);
             //三、部门下新增人员关系数据
             CustomerStaffDepartmentEntity dept = new CustomerStaffDepartmentEntity();

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -894,9 +894,17 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         }
         List<String> newRoles = new ArrayList<>();
         newRoles.add(resultRole.getData().getId());
+        fromDTO.setNewRoles(newRoles);
 
         //3.新增工作人员
         Result<CustomerStaffDTO> 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;
     }