Merge branch 'huacheng' into huacheng_test

101captain

2022-07-06 d6578ec702eb4fcff690d71ea3237a885f46b85c

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -415,6 +415,11 @@
            if(count>0){
                loginUserInfoVO.setIsCheckUnitAdmin(1);
            }
            Long checkUnitId=userDao.selectCheckUnitId(phone);
            if(checkUnitId!=null){
                loginUserInfoVO.setCheckUnitId(checkUnitId);
            }

            else {
                loginUserInfoVO.setIsCheckUnitAdmin(0);
            }
@@ -3287,4 +3292,12 @@
        }
        return R.fail("信息错误");
    }

    @Override
    public R checkExport(String account, String password,String oldPassword) {
        if(new BCryptPasswordEncoder().matches(password, oldPassword)){
            return R.ok();
        }
        return R.fail();
    }
}