user/role/tright 7.19

src/main/java/com/pangding/web/authority/controller/CompanyManagementController.java

@@ -178,8 +178,6 @@ public class CompanyManagementController {
                 .notBlankCheck("email",reqVo.getEmail())
                 .notBlankCheck("phone",reqVo.getPhone())
                 .checkPhoneNo("phone",reqVo.getPhone())
-                .notBlankCheck("createId",reqVo.getCreateId())
-                .notBlankCheck("createName",reqVo.getCreateName())
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .checkException();
         return ResponseResult.result(companyServiceImpl.saveUser(reqVo));

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

@@ -169,8 +169,6 @@ public class RegisterServiceImpl implements RegisterService {
     @Transactional(rollbackFor = Exception.class)
     public SaveCompanyResVo saveIndividual(RegisterIndividualReqVo reqVo) {
 
-        this.checkPhone(reqVo.getId(),reqVo.getContactPhone());
-
         /*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
         CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
         companyGetReqVo.setId(reqVo.getId());
@@ -245,8 +243,6 @@ public class RegisterServiceImpl implements RegisterService {
     @Transactional(rollbackFor = Exception.class)
     public SaveCompanyResVo saveEnterprice(RegisterEnterpriceReqVo reqVo) {
 
-        this.checkPhone(reqVo.getId(),reqVo.getContactPhone());
-
         /*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
         CompanyReqVo companyReqVo = new CompanyReqVo();
         companyReqVo.setBankList(new ArrayList());
@@ -278,7 +274,7 @@ public class RegisterServiceImpl implements RegisterService {
         ObjectHelper.writeWithFrom(companyBankCardVo,bankList.get(0));
         companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
         companyBankCardVo.setPhone(reqVo.getContactPhone());
-        companyBankCardDaoImpl.save(companyBankCardVo);
+        companyBankCardDaoImpl.create(companyBankCardVo);
 
         /*保存公司扩展表*/
         CompanyExtendVo extendVo = new CompanyExtendVo();

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

@@ -124,7 +124,8 @@ public class UserServiceImpl implements UserService {
         UserGetReqVo userGetReqVo = new UserGetReqVo();
         userGetReqVo.setAccount(userVo.getAccount());
         UserVo userVo1 = userDao.load(userGetReqVo,UserVo.class);
-        if (null != userVo1){
+        if ((null != userVo1 && null == userVo.getId()) ||
+                (null != userVo1 && null != userVo.getId() && !userVo1.getId().equals(userVo.getId()))){
             throw new CodeException("用户名"+userVo.getAccount()+"已存在");
         }
     }
@@ -134,7 +135,8 @@ public class UserServiceImpl implements UserService {
         UserGetReqVo userGetReqVo = new UserGetReqVo();
         userGetReqVo.setPhone(userVo.getPhone());
         UserVo userVo1 = userDao.load(userGetReqVo,UserVo.class);
-        if (null != userVo1){
+        if ((null != userVo1 && null == userVo.getId()) ||
+                (null != userVo1 && null != userVo.getId() && !userVo1.getId().equals(userVo.getId()))){
             throw new CodeException("手机号"+userVo.getPhone()+"已存在");
         }
     }