Commit bca36f56 authored by zjy's avatar zjy

user/role/tright 7.21

parent fc6b57b1
...@@ -10,12 +10,6 @@ import com.yanzuoguang.util.vo.PageSizeData; ...@@ -10,12 +10,6 @@ import com.yanzuoguang.util.vo.PageSizeData;
* @create 2019/5/13 14:24 * @create 2019/5/13 14:24
*/ */
public interface CompanyDao extends BaseDao { public interface CompanyDao extends BaseDao {
/**
* 检查电话号码是否已存在
*
* @param companyVo CompanyVo对象
*/
void checkPhone(CompanyVo companyVo);
/** /**
* 获取公司列表分页对象 * 获取公司列表分页对象
......
...@@ -24,14 +24,6 @@ public interface UserDao extends BaseDao { ...@@ -24,14 +24,6 @@ public interface UserDao extends BaseDao {
*/ */
void checkAccount(UserVo account); void checkAccount(UserVo account);
/**
* 检查电话号码是否存在
*
* @param phone 电话号码
*/
void checkPhone(UserVo phone);
/** /**
* 通过用户id查询UserVo对象 * 通过用户id查询UserVo对象
* *
......
...@@ -14,7 +14,6 @@ import org.springframework.stereotype.Component; ...@@ -14,7 +14,6 @@ import org.springframework.stereotype.Component;
@Component @Component
public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao { public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
private static final String CHECK_PHONE = "CHECK_PHONE";
private static final String SELECT = "SELECT"; private static final String SELECT = "SELECT";
@Override @Override
...@@ -22,8 +21,6 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao { ...@@ -22,8 +21,6 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
register(CompanyVo.class); register(CompanyVo.class);
table.addExist(CHECK_PHONE,"contact_phone");
table.add(SELECT,"select * from pd_company where 1=1 ") table.add(SELECT,"select * from pd_company where 1=1 ")
.add("companyName","and company_name = ? ") .add("companyName","and company_name = ? ")
.add("companyType","and company_type = ? ") .add("companyType","and company_type = ? ")
...@@ -32,11 +29,6 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao { ...@@ -32,11 +29,6 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
.add("companyId","and invitation_company_id = ? "); .add("companyId","and invitation_company_id = ? ");
} }
@Override
public void checkPhone(CompanyVo companyVo) {
this.checkExist(CHECK_PHONE,companyVo,"电话号码已存在");
}
@Override @Override
public PageSizeData<CompanyVo> getCompanyList(ListCompanyReqVo reqVo) { public PageSizeData<CompanyVo> getCompanyList(ListCompanyReqVo reqVo) {
return this.queryPage(CompanyVo.class,reqVo,SELECT,reqVo); return this.queryPage(CompanyVo.class,reqVo,SELECT,reqVo);
......
...@@ -21,7 +21,6 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao { ...@@ -21,7 +21,6 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
private static final String SELECT = "SELECT"; private static final String SELECT = "SELECT";
private static final String CHECK_ACCOUNT = "CHECK_ACCOUNT"; private static final String CHECK_ACCOUNT = "CHECK_ACCOUNT";
private static final String CHECK_PHONE = "CHECK_PHONE";
private static final String GET_ADMIN = "GET_ADMIN"; private static final String GET_ADMIN = "GET_ADMIN";
private static final String COUNT_BY_ROLE = "COUNT_BY_ROLE"; private static final String COUNT_BY_ROLE = "COUNT_BY_ROLE";
...@@ -33,8 +32,6 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao { ...@@ -33,8 +32,6 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
table.addExist(CHECK_ACCOUNT,"account"); table.addExist(CHECK_ACCOUNT,"account");
table.addExist(CHECK_PHONE,"phone");
table.add(GET_ADMIN,"SELECT u.* FROM pd_user u,pd_user_role ur WHERE u.id = ur.user_id") table.add(GET_ADMIN,"SELECT u.* FROM pd_user u,pd_user_role ur WHERE u.id = ur.user_id")
.add("superAdminRoleId","and ur.role_id = ?") .add("superAdminRoleId","and ur.role_id = ?")
.add("companyId","and u.company_id = ? "); .add("companyId","and u.company_id = ? ");
...@@ -51,11 +48,6 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao { ...@@ -51,11 +48,6 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
this.checkExist(CHECK_ACCOUNT,account,"用戶名已存在:"+account.getAccount()); this.checkExist(CHECK_ACCOUNT,account,"用戶名已存在:"+account.getAccount());
} }
@Override
public void checkPhone(UserVo phone) {
this.checkExist(CHECK_PHONE,phone,"手机号已存在:"+phone.getPhone());
}
@Override @Override
public UserVo getUser(UserGetReqVo reqVo) { public UserVo getUser(UserGetReqVo reqVo) {
return this.load(reqVo,UserVo.class); return this.load(reqVo,UserVo.class);
......
...@@ -34,13 +34,6 @@ public interface RegisterService { ...@@ -34,13 +34,6 @@ public interface RegisterService {
*/ */
CompanyVo saveUser(RegisterUserReqVo registerUserReqVo) throws Exception; CompanyVo saveUser(RegisterUserReqVo registerUserReqVo) throws Exception;
/**
* 检查电话号码是否已存在
*
* @param contactPhone 联系电话
*/
void checkPhone(String id,String contactPhone);
/** /**
* 保存个人注册的公司信息 * 保存个人注册的公司信息
* *
......
...@@ -146,19 +146,6 @@ public class RegisterServiceImpl implements RegisterService { ...@@ -146,19 +146,6 @@ public class RegisterServiceImpl implements RegisterService {
return companyVo; return companyVo;
} }
/**
* 检查电话号码是否已存在
*
* @param contactPhone 联系电话
*/
@Override
public void checkPhone(String id,String contactPhone) {
CompanyVo companyVo = new CompanyVo();
companyVo.setId(id);
companyVo.setContactPhone(contactPhone);
companyDaoImpl.checkPhone(companyVo);
}
/** /**
* 保存个人注册的公司信息 * 保存个人注册的公司信息
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment