Merge remote-tracking branch 'origin/dev_ic_platform' into develop

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

@@ -67,4 +67,14 @@ public class StaffBasicInfoResultDTO implements Serializable {
 	 */
     private List<String> roleList;
 
+	/**
+	 * 当前工作人员所属组织的agencyId
+	 */
+	private String agencyId;
+
+	/**
+	 * 当前工作人员所属组织的agencyName
+	 */
+	private String agencyName;
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -396,7 +396,7 @@ public class CustomerStaffController {
      **/
     @PostMapping(value = "staffbasicinfo")
     public Result<StaffBasicInfoResultDTO> staffBasicInfo(@LoginUser TokenDto tokenDTO){
-        return customerStaffService.selectStaffBasicInfo(tokenDTO.getUserId());
+        return customerStaffService.selectStaffBasicInfo(tokenDTO.getUserId(),tokenDTO.getCustomerId());
     }
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java

@@ -305,7 +305,7 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @Author zhangyong
 	 * @Date 11:10 2020-08-25
 	 **/
-    Result<StaffBasicInfoResultDTO> selectStaffBasicInfo(String userId);
+    Result<StaffBasicInfoResultDTO> selectStaffBasicInfo(String userId,String customerId);
 
 	/**
 	 * @param  formDTO

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

@@ -26,6 +26,7 @@ import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
@@ -81,7 +82,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao, CustomerStaffEntity> implements CustomerStaffService {
-	private Logger logger = LogManager.getLogger(getClass());
+	private final Logger logger = LogManager.getLogger(getClass());
 	@Autowired
 	private GovStaffRoleService govStaffRoleService;
 	@Autowired
@@ -415,7 +416,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 			logger.info("修改用户信息:修改用户已缓存的角色列表成功");
 		} catch (Exception e) {
 			e.printStackTrace();
-			logger.error("修改用户信息:修改用户已缓存的角色列表异常:{}", ExceptionUtils.getErrorStackTrace(e));;
+			logger.error("修改用户信息:修改用户已缓存的角色列表异常:{}", ExceptionUtils.getErrorStackTrace(e));
 		}
 
 		// 角色放缓存
@@ -726,10 +727,15 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	}
 
     @Override
-    public Result<StaffBasicInfoResultDTO> selectStaffBasicInfo(String userId) {
+    public Result<StaffBasicInfoResultDTO> selectStaffBasicInfo(String userId,String customerId) {
 		StaffBasicInfoResultDTO resultDTO = baseDao.selectStaffBasicInfo(userId);
 		if(null!=resultDTO){
 			resultDTO.setRoleList(baseDao.selectStaffRoles(userId,resultDTO.getCustomerId()));
+			CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId);
+			if (null != staffInfo){
+				resultDTO.setAgencyId(staffInfo.getAgencyId());
+				resultDTO.setAgencyName(staffInfo.getAgencyName());
+			}
 		}
         return new Result<StaffBasicInfoResultDTO>().ok(resultDTO);
     }