forked from kidgrow-microservices-platform

zhaoxiaohao
2020-06-30 147a649dbb6e473e0a0f9d3a6aa854a7add4d990
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);
@@ -240,6 +242,8 @@
        user.setPassword(passwordEncoder.encode(newPassword));
        if (isdefault) {
            user.setDefaultAuth(true);
        }else {
            user.setDefaultAuth(false);
        }
        baseMapper.updateById(user);
        if (isdefault) {
@@ -933,7 +937,7 @@
     * @param phone
     * @return
     */
    private boolean phoneIsUsed(String phone) {
    public boolean phoneIsUsed(String phone) {
        Map<String, Object> selectMap = new HashMap<>();
        selectMap.put("mobile", phone);
        List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
@@ -951,12 +955,9 @@
        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 +965,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不存在