1.运营后台统一增加token过期自动跳转登录页 2.H端和运营平台同账户可根据权限自由登录.

houruijun

2020-07-14 ca56e2f284db90ce6b8466e0e93b5bd30912320c

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java

@@ -165,7 +165,8 @@
    public SysUser selectByUsername(String username) {
        String clientId = ClientContextHolder.getClient();
        List<SysUser> users = baseMapper.selectList(
                new QueryWrapper<SysUser>().eq("username", username).eq("tenant_id", clientId)
                //new QueryWrapper<SysUser>().eq("username", username).eq("tenant_id", clientId)
                new QueryWrapper<SysUser>().eq("username", username)
        );
        return getUser(users);
    }
@@ -922,9 +923,14 @@
     * @return
     */
    @Override
    public ResultBody hospitalDoctorList(Long hospitalId, Long departmentId) {
    public ResultBody hospitalDoctorList(Long hospitalId, Long departmentId,Boolean isIncluddel) {
        if (hospitalId > 0 && departmentId > 0) {
            List<HospitalDoctorListVo> listVoList = baseMapper.hospitalDoctorList(hospitalId, departmentId,CommonConstant.HOSPITAL_DOCTOR_ID,CommonConstant.HOSPITAL_ADMIN_ID);
            List<HospitalDoctorListVo> listVoList;
            if(isIncluddel){
                listVoList= baseMapper.hospitalDoctorListAndDel(hospitalId, departmentId,CommonConstant.HOSPITAL_DOCTOR_ID,CommonConstant.HOSPITAL_ADMIN_ID);
            }else {
                listVoList=baseMapper.hospitalDoctorList(hospitalId, departmentId,CommonConstant.HOSPITAL_DOCTOR_ID,CommonConstant.HOSPITAL_ADMIN_ID);
            }
            return ResultBody.ok().data(listVoList);
        } else {
            return ResultBody.failed("医院数据有误");