Merge remote-tracking branch 'origin/master'

liyuqian

2022-08-29 eaf3bec9a8850378263ae37b6a0488048de57be3

Merge remote-tracking branch 'origin/master'

 phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java

@@ -3,6 +3,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;

import java.util.List;

/**
 * @author fwq
 * 员工扩展
@@ -11,4 +13,8 @@
public class EmployeeDto extends PageDto {
    /**修改时间*/
    private String updateTime;
    /**员工企业userId*/
    private String userId;
    /**员工角色唯一标识数组*/
    private List<String> roleList;
}

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java

@@ -53,4 +53,11 @@
     */
    @PostMapping(value = "/emp/medical/info")
    Result getEmpMedicalInfo(@RequestBody(required = false) String empId);

    /**
     * 判断用户是否存在企业userId,是否存在传递的角色
     */
    @PostMapping(value = "/emp/userId/role/check")
    Result checkUserIdRole(@RequestBody(required = false)EmployeeDto employeeDto);

}