Merge branch 'master' of http://192.168.0.204/pd-new/pd-user

src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java

@@ -834,22 +834,21 @@ public class CompanyServiceImpl implements CompanyService {
         CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
         companyExtendGetReqVo.setQrCode(reqVo.getQrCode());
         CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo, CompanyExtendVo.class);
-        if (null == companyExtendVo) {
-            throw new CodeException("未查询到对应公司数据");
-        }
+        if (null != companyExtendVo) {
             CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
             companyGetReqVo.setId(companyExtendVo.getId());
             GetCompanyResVo companyVo = companyDao.load(companyGetReqVo, GetCompanyResVo.class);
-        if (null == companyVo) {
-            throw new CodeException("未查询到对应公司数据");
-        }
+            if (null != companyVo) {
                 CompanyMsgReqVo companyMsgReqVo = new CompanyMsgReqVo();
                 companyMsgReqVo.setCompanyId(companyVo.getId());
                 companyMsgReqVo.setType(companyVo.getCompanyAttribute());
                 List<GetCompanyMsgResVo> companyMsgVoList = companyMsgDao.findCompanyMsgList(companyMsgReqVo);
                 companyVo.setMsgList(companyMsgVoList);
+            }
             return companyVo;
         }
+        return null;
+    }
 
     @Override
     public List<GetCompanyDivideResVo> findCompanyDivideInfo(CompanyDivideReqVo req){