Merge remote-tracking branch 'origin/master'

heheng

20 小时以前 c6901af945ffbabafb4d50f39d2beb3b6a4af677

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanyBasicServiceImpl.java

@@ -31,8 +31,7 @@
    @Override
    public CommonPage selectCompanyBasicList(Integer companyId) {

        boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
        if (!admin){
        if (!SecurityUtils.adminUser()){
            if (companyId==null){
                throw new ApiException("非管理员操作,查询条件不可为空");
            }