修复冲突

Implements/User/RealCompanyVerifyImpl.py

@@ -235,8 +235,6 @@ class RealCompanyVerifyImpl(RealCompanyVerify):
 
             res = json.loads(response.text)
             if res['info'] == "企业数据初始化成功":
-                raise ReturnConditionCheckFailed("企业数据初始化异常", 200)
-            else:
                 company_user = TFSECompanyUser()
                 company_user.cid = self.cid
                 company_user.name = self.name
@@ -248,6 +246,8 @@ class RealCompanyVerifyImpl(RealCompanyVerify):
                     {"企业ID": self.cid},
                     company_user.dict_keys_toggle(columns=["企业名称", "已认证"])
                 )
+            else:
+                raise ReturnConditionCheckFailed("企业数据初始化异常", 200)
 
         def __main__():
             get_verify_info()