Merge remote-tracking branch 'remotes/origin/dev' into prod

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

@@ -176,8 +176,9 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
         if (CollectionUtils.isEmpty(data)){
             return new ArrayList<>();
         }
-        gridStaff.stream().forEach(g -> data.stream().filter(d -> g.getStaffId().equals(d.getStaffId()) && g.getGridId().equals(d.getGridId())).forEach(d -> g.setMobile(d.getMobile())));
+        /*gridStaff.stream().forEach(g -> data.stream().filter(d -> g.getStaffId().equals(d.getStaffId()) && g.getGridId().equals(d.getGridId())).forEach(d -> g.setMobile(d.getMobile())));
-        return gridStaff.stream().filter(g -> StringUtils.isNotBlank(g.getMobile())).collect(Collectors.toList());
+        return gridStaff.stream().filter(g -> StringUtils.isNotBlank(g.getMobile())).collect(Collectors.toList());*/
+        return data;
     }
 
     /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java

@@ -1,7 +1,6 @@
 package com.epmet.dto.result;
 
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java

@@ -16,7 +16,7 @@ public class StaffBasicInfoResultDTO implements Serializable {
 	 * 客户Id
 	 */
 	private String customerId;
-
+	private String customerName;
 	/**
 	 * 用户Id
 	 */

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

@@ -742,6 +742,16 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 				resultDTO.setLongitude(staffInfo.getLongitude());
 				resultDTO.setLatitude(staffInfo.getLatitude());
 			}
+			//获取工作人员所属客户名
+			CustomerDTO dto = new CustomerDTO();
+			dto.setId(customerId);
+			Result<CustomerDTO> customerResult = operCrmOpenFeignClient.getCustomerInfo(dto);
+			if (!customerResult.success()) {
+				throw new RenException(customerResult.getCode(), customerResult.getMsg());
+			}
+			if (null != customerResult.getData()) {
+				resultDTO.setCustomerName(customerResult.getData().getCustomerName());
+			}
 		}
         return new Result<StaffBasicInfoResultDTO>().ok(resultDTO);
     }

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

@@ -138,8 +138,8 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
             return new ArrayList<>();
         }
         List<String> userIds = forms.stream().map(m -> m.getStaffId()).distinct().collect(Collectors.toList());
-        List<GridStaffResultDTO> result = baseDao.staffGridRoleByIds(userIds);
+//        List<GridStaffResultDTO> result = baseDao.staffGridRoleByIds(userIds);
-        /*List<GridStaffResultDTO> result = baseDao.staffGridRole(forms);*/
+        List<GridStaffResultDTO> result = baseDao.staffGridRole(forms);
         if (CollectionUtils.isEmpty(result)){
             return new ArrayList<>();
         }