Merge remote-tracking branch 'origin/master'

src/main/java/com/chelvc/cloud/admin/controller/EmployeeController.java

@@ -10,7 +10,9 @@ import com.chelvc.cloud.uc.api.dto.EmployeeDetailDTO;
 import com.chelvc.cloud.uc.api.param.EmployeeModifyParam;
 import com.chelvc.cloud.uc.api.param.EmployeePagingParam;
 import com.chelvc.cloud.uc.api.service.EmployeeService;
+import com.chelvc.cloud.vehicle.api.service.MerchantService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
+import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.base.util.ResourceUtils;
 import com.chelvc.framework.common.model.Pagination;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -37,6 +39,9 @@ public class EmployeeController {
     @DubboReference
     private EmployeeService employeeService;
 
+    @DubboReference
+    private MerchantService merchantService;
+
     /**
      * 新增员工
      *
@@ -68,7 +73,10 @@ public class EmployeeController {
     @GetMapping("/employee/mine")
     public PersonalVO getPersonal() {
         EmployeeDetailDTO employee = this.employeeService.getMine();
-        return EmployeeCopier.INSTANCE.employee2personal(employee);
+        Long userId = SessionContextHolder.getSession().getId();
+        PersonalVO personalVO = EmployeeCopier.INSTANCE.employee2personal(employee);
+        personalVO.setMerchantList(this.merchantService.getMerchantIdsByUserId());
+        return personalVO;
     }
 
     /**

src/main/java/com/chelvc/cloud/admin/vo/PersonalVO.java

@@ -3,6 +3,7 @@ package com.chelvc.cloud.admin.vo;
 import java.io.Serializable;
 import java.util.List;
 
+import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
 import com.chelvc.framework.common.model.Tree;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -56,6 +57,10 @@ public class PersonalVO implements Serializable {
      * 所属部门
      */
     private DepartmentVO department;
+    /**-
+     * 商家信息
+     */
+    private List<MerchantDTO> merchantList;
 
     /**
      * 部门信息