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

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java

@@ -370,6 +370,7 @@ public class DepartmentServiceImpl implements DepartmentService {
         //姓名不一样的给反馈
         if (!formDTO.getPersonName().equals(userResult.getData().getRealName())) {
             resultDTO.setPersonName(userResult.getData().getRealName());
+            resultDTO.setMsg("联系电话已存在工作账号，姓名已更新");
         }
 
         resultDTO.setType(true);
@@ -395,7 +396,7 @@ public class DepartmentServiceImpl implements DepartmentService {
             StaffSubmitFromDTO submitDTO = ConvertUtils.sourceToTarget(formDTO, StaffSubmitFromDTO.class);
             submitDTO.setName(formDTO.getPersonName());
             submitDTO.setAgencyId(staffInfo.getAgencyId());
-            submitDTO.setGender(0);
+            submitDTO.setGender(1);
             submitDTO.setWorkType("fulltime");
             Result<CustomerStaffDTO> staffResult = epmetUserOpenFeignClient.deptToAddStaff(submitDTO);
             if (!staffResult.success()) {

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml

@@ -17,6 +17,8 @@
             address,
             longitude,
             latitude,
+            principal,
+            mobile,
             del_flag,
             revision,
             created_by,
@@ -39,6 +41,8 @@
                 #{i.address},
                 #{i.longitude},
                 #{i.latitude},
+                #{i.principal},
+                #{i.mobile},
                 0,
                 0,
                 #{i.createdBy},
@@ -57,6 +61,8 @@
             address = values(address),
             longitude = null,
             latitude = null,
+            principal = values(principal),
+            mobile = values(mobile),
             updated_by = values(updated_by),
             updated_time = NOW()
     </insert>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml

@@ -17,6 +17,8 @@
             address,
             longitude,
             latitude,
+            principal,
+            mobile,
             del_flag,
             revision,
             created_by,
@@ -39,6 +41,8 @@
                 #{i.address},
                 #{i.longitude},
                 #{i.latitude},
+                #{i.principal},
+                #{i.mobile},
                 0,
                 0,
                 #{i.createdBy},
@@ -57,6 +61,8 @@
             address = values(address),
             longitude = null,
             latitude = null,
+            principal = values(principal),
+            mobile = values(mobile),
             updated_by = values(updated_by),
             updated_time = NOW()
     </insert>

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

@@ -900,7 +900,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         Result<CustomerStaffDTO> result = addStaff(fromDTO);
 
         //4.新增数字平台角色信息
-        Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), fromDTO.getStaffId(), fromDTO.getCustomerId()));
+        Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), result.getData().getUserId(), fromDTO.getCustomerId()));
         if (!roleUserAccess.success()) {
             throw new RenException("工作人员新增数字平台角色信息失败" + resultRole.getMsg());
         }