findyguo
2021-03-05 e15b190f50985667ba8f6e69bafe23596a29830c
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -156,6 +156,8 @@
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setPhone(purePhoneNumber);
        sysUserDO.setUserId(userId);
        userDao.updateMemberRole(purePhoneNumber, purePhoneNumber);
        userDao.updateServiceTeam(purePhoneNumber, purePhoneNumber);
        int i = userDao.updateById(sysUserDO);
        if (i > 0) {
            return R.ok();
@@ -225,6 +227,7 @@
            });
            loginUserInfoVO.setRoles(set);
        }
        loginUserInfoVO.setIsmemberrole(2);
//        志愿者状态
        String phone = sysUserDO.getPhone();
        if (!ObjectUtils.isEmpty(phone)) {
@@ -234,6 +237,13 @@
            }else{
                int state = comMngVolunteerMngVO.getState().intValue();
                loginUserInfoVO.setVolunteerStatus(state);
            }
            Integer countTeam = userDao.selectCountTeam(phone);
            Integer selectCountMemberRole = userDao.selectCountMemberRole(phone);
            if(countTeam!=null&&countTeam>0) {
               loginUserInfoVO.setIsmemberrole(1);
            }else if(selectCountMemberRole!=null&&selectCountMemberRole>0) {
               loginUserInfoVO.setIsmemberrole(1);
            }
        }
        return R.ok(loginUserInfoVO);
@@ -590,8 +600,11 @@
        SysUserDO sysUserDO=new SysUserDO();
        sysUserDO.setUserId(userPhoneVO.getUserId());
        sysUserDO.setPhone(newPhone);
        userDao.updateMemberRole(newPhone, oldPhone);
        userDao.updateServiceTeam(newPhone, oldPhone);
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
@@ -1485,8 +1498,7 @@
        List<EexcelUserDTO> eexcelUserDTOS=userDao.selectExport(exportUserDTO);
        return R.ok(eexcelUserDTOS);
    }
    public static void main(String[] args) {
//        String encode = new BCryptPasswordEncoder().encode("lbsq123456");
//        System.out.println(encode);