user/role/tright 7.13

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

@@ -370,19 +370,19 @@ public class RegisterServiceImpl implements RegisterService {
         tokenService.save(loginVo);
 
         /*判断基本信息是否完善，及状态是否为2，且为个人用户，若不完善则跳转个人完善页面*/
-        if (companyVo.getStatus()!=(LoginConstant.FINISHED_BASIC_INFO) && CompanyConstant.COMPANY_TYPE_PERSON==(companyVo.getCompanyType())){
+        if (companyVo.getStatus() < (CompanyConstant.COMPANY_STATUS_BIND_PHONE) && CompanyConstant.COMPANY_TYPE_PERSON==(companyVo.getCompanyType())){
             resVo.setCode("01");
             resVo.setMsg("个人基本信息未完善，跳转个人完善页面");
             return resVo;
         }
         /*判断基本信息是否完善，及状态是否为2，且为公司用户，若不完善则跳转个人完善页面*/
-        else if (companyVo.getStatus()!=(LoginConstant.FINISHED_BASIC_INFO) && (CompanyConstant.COMPANY_TYPE_COMPANY==(companyVo.getCompanyType()))){
+        else if (companyVo.getStatus() < (CompanyConstant.COMPANY_STATUS_BIND_PHONE) && (CompanyConstant.COMPANY_TYPE_COMPANY==(companyVo.getCompanyType()))){
             resVo.setCode("02");
             resVo.setMsg("公司基本信息未完善，跳转公司完善页面");
             return resVo;
         }
         /*判断电子签约状态，若不为10，则跳转签约页面*/
-        else if (companyVo.getSigningStatus() != (LoginConstant.HAVE_SIGNED)){
+        else if (companyVo.getSigningStatus() < (CompanyConstant.COMPANY_STATUS_SIGN_CONTRACT)){
             resVo.setCode("04");
             resVo.setMsg("未签约，跳转签约页面");
             resVo.setUrl("TODO");