修改app注册

src/main/java/com/pangding/web/authority/dao/impl/RoleDaoImpl.java

@@ -31,7 +31,7 @@ public class RoleDaoImpl extends BaseDaoImpl implements RoleDao {
         table.add(SELECT,"select * from pd_role where 1=1 ")
         .add("id","and pid = ?");
 
-        table.add(GET_EMPTY_ROLES,"select * from pd_role where company_id = ''");
+        table.add(GET_EMPTY_ROLES,"select * from pd_role where 1=1 ");
     }
 
     @Override

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

@@ -235,12 +235,12 @@ public class RegisterServiceImpl implements RegisterService {
     @Override
     public SaveCompanyResVo saveEnterprice(RegisterEnterpriceReqVo reqVo) {
 
-        CompanyVo companyVo1 = new CompanyVo();
-        companyVo1.setContactPhone(reqVo.getContactPhone());
-        CompanyVo companyVo2 = companyDaoImpl.load(companyVo1,CompanyVo.class);
-        if (null != companyVo2 && !reqVo.getId().equals(companyVo2.getId())){
-            throw new CodeException("该号码已存在");
-        }
+//        CompanyVo companyVo1 = new CompanyVo();
+//        companyVo1.setContactPhone(reqVo.getContactPhone());
+//        CompanyVo companyVo2 = companyDaoImpl.load(companyVo1,CompanyVo.class);
+//        if (null != companyVo2 && !reqVo.getId().equals(companyVo2.getId())){
+//            throw new CodeException("该号码已存在");
+//        }
         /*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
         CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
         companyGetReqVo.setId(reqVo.getId());
@@ -375,7 +375,7 @@ public class RegisterServiceImpl implements RegisterService {
             throw new CodeException("用户名或密码错误");
         }
         String token = TokenUtil.createToken(reqVo.getAccountOrPhone());
-        TokenHelper.write(token,reqVo);
+
         LoginResVo resVo = new LoginResVo();
         resVo.setToken(token);
         userVo.setPassword("");
@@ -394,7 +394,7 @@ public class RegisterServiceImpl implements RegisterService {
         loginVo.setData(JsonHelper.serialize(reqVo));
         loginVo.setExpairTime(DateHelper.getNow());
         tokenService.save(loginVo);
-
+        TokenHelper.write(token,loginVo);
         CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
         getReqVo.setCompanyId(companyVo.getId());
         List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDaoImpl.loadList(getReqVo,CompanyBankCardVo.class);