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

@@ -113,6 +113,7 @@
    @Override
    public LoginAppUser getLoginAppUser(SysUser sysUser) {
        LoginAppUser loginAppUser = new LoginAppUser();
        SysUser sysUserNew = this.baseMapper.selectById(sysUser);
        if (sysUser != null) {
            //返回的数据为什么要把密码也返回？清空!!
            loginAppUser.setPassword("");
@@ -121,6 +122,7 @@

            BeanUtils.copyProperties(sysUser, loginAppUser);
            //获取用户所属组织机构列表
            loginAppUser.setDefaultAuth(sysUserNew.getDefaultAuth());
            List<SysOrganization> sysOrganizations = organizationService.findListByUserId(sysUser.getId());
            //设置组织机构集合
            loginAppUser.setOrganizations(sysOrganizations);
@@ -163,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);
    }
@@ -240,6 +243,8 @@
        user.setPassword(passwordEncoder.encode(newPassword));
        if (isdefault) {
            user.setDefaultAuth(true);
        }else {
            user.setDefaultAuth(false);
        }
        baseMapper.updateById(user);
        if (isdefault) {
@@ -918,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("医院数据有误");
@@ -936,6 +946,7 @@
    public boolean phoneIsUsed(String phone) {
        Map<String, Object> selectMap = new HashMap<>();
        selectMap.put("mobile", phone);
        selectMap.put("is_del", 0);
        List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
        return (sysUsers.size() > 0);
    }
@@ -946,17 +957,14 @@
     * @param depatmentId
     * @return
     */
    private Integer departmetAccountsCount(Long depatmentId) {
    public Integer departmetAccountsCount(Long depatmentId) {
        SysDepartment sysDepartment = departmentService.getById(depatmentId);
        if (sysDepartment == null) {
            return 0;
        } else {
            Map<String, Object> selectMap = new HashMap<>();
            selectMap.put("department_id", depatmentId);
            selectMap.put("enabled", 1);
            List<SysDoctor> sysDoctorList = sysDoctorMapper.selectByMap(selectMap);
            if (sysDoctorList != null) {
                int doctorCount = sysDoctorList.size();
            List<HospitalDoctorListVo> hospitalDoctorListVos = baseMapper.hospitalDoctorList(sysDepartment.getHospitalId(), depatmentId, CommonConstant.HOSPITAL_DOCTOR_ID, CommonConstant.HOSPITAL_ADMIN_ID);
            if (hospitalDoctorListVos != null) {
                int doctorCount = hospitalDoctorListVos.size();
                int accountCount = sysDepartment.getAccountsCount();
                return (accountCount - doctorCount);
            } else {
@@ -964,6 +972,24 @@
            }
        }
    }
//    private Integer departmetAccountsCount(Long depatmentId) {
//        SysDepartment sysDepartment = departmentService.getById(depatmentId);
//        if (sysDepartment == null) {
//            return 0;
//        } else {
//            Map<String, Object> selectMap = new HashMap<>();
//            selectMap.put("department_id", depatmentId);
//            selectMap.put("enabled", 1);
//            List<SysDoctor> sysDoctorList = sysDoctorMapper.selectByMap(selectMap);
//            if (sysDoctorList != null) {
//                int doctorCount = sysDoctorList.size();
//                int accountCount = sysDepartment.getAccountsCount();
//                return (accountCount - doctorCount);
//            } else {
//                return 0;
//            }
//        }
//    }

    /**
     * 检查用户登录名是否已经注册 true存在  false不存在