8.20

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

@@ -178,7 +178,7 @@ public class CompanyServiceImpl implements CompanyService {
         /*返回结果对象*/
         SaveCompanyResVo resVo = new SaveCompanyResVo();
         /*检查用户名*/
-        if (null != reqVo.getAccount()){
+        if (!StringHelper.isEmpty(reqVo.getAccount())){
             userServiceImpl.isValid(reqVo.getAccount());
             UserVo userReqVo = new UserVo();
             userReqVo.setAccount(reqVo.getAccount());
@@ -207,7 +207,7 @@ public class CompanyServiceImpl implements CompanyService {
         if (reqVo.getCompanyType() == 1) {
             CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
             ObjectHelper.writeWithFrom(companyBankCardVo, reqVo);
-            companyBankCardVo.setId(reqVo.getCompanyBankCardId()!=null?reqVo.getCompanyBankCardId():StringHelper.getNewID());
+            companyBankCardVo.setId(!StringHelper.isEmpty(reqVo.getCompanyBankCardId())?reqVo.getCompanyBankCardId():StringHelper.getNewID());
             companyBankCardVo.setName(reqVo.getContactName());
             companyBankCardVo.setPhone(reqVo.getContactPhone());
             companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
@@ -232,7 +232,7 @@ public class CompanyServiceImpl implements CompanyService {
         companyVo1.setCompanyAttribute(companyReqVo.getCompanyAttribution());
 
         /*保存公司主表*/
-        if (reqVo.getCompanyId()!=null){
+        if (!StringHelper.isEmpty(reqVo.getCompanyId())){
             companyDao.update(companyVo1);
         }else {
             companyDao.create(companyVo1);
@@ -249,7 +249,7 @@ public class CompanyServiceImpl implements CompanyService {
             ObjectHelper.writeWithFrom(companyBankCardVo, companyBankReqVo);
             companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
 
-            if (null != reqVo.getCompanyBankCardId()){
+            if (!StringHelper.isEmpty(reqVo.getCompanyBankCardId())){
                 companyBankCardDao.update(companyBankCardVo);
             }else {
                 companyBankCardDao.create(companyBankCardVo);
@@ -266,7 +266,7 @@ public class CompanyServiceImpl implements CompanyService {
                 .replace(":", "")
                 .replace(" ", "");
         extendVo.setQrCode(qrCode);
-        if (null != reqVo.getCompanyExtendId()){
+        if (!StringHelper.isEmpty(reqVo.getCompanyExtendId())){
             companyExtendDaoImpl.update(extendVo);
         }else {
             companyExtendDaoImpl.create(extendVo);
@@ -294,19 +294,26 @@ public class CompanyServiceImpl implements CompanyService {
 
         /*保存用户*/
         UserVo userVo = new UserVo();
-        userVo.setId(reqVo.getUserId()!=null?reqVo.getUserId():StringHelper.getNewID());
+        if (StringHelper.isEmpty(reqVo.getUserId())){
+            userVo.setId(StringHelper.getNewID());
+            userVo.setPassword(StringHelper.md5("123456"));
+            userVo.setRemark("123456");
+            userVo.setCreateId(reqVo.getCreateId());
+            userVo.setCreateName(reqVo.getCreateName());
+            userVo.setCompanyId(companyVo.getId());
+            userVo.setIsFirst(1);
+        }else{
+            UserGetReqVo userGetReqVo = new UserGetReqVo();
+            userGetReqVo.setId(reqVo.getUserId());
+            userVo = userDaoImpl.load(userGetReqVo,UserVo.class);
+        }
         userVo.setAccount(reqVo.getAccount());
-        userVo.setPassword(StringHelper.md5("123456"));
-        userVo.setRemark("123456");
         userVo.setName(reqVo.getContactName());
-        userVo.setCreateId(reqVo.getCreateId());
-        userVo.setCreateName(reqVo.getCreateName());
-        userVo.setCompanyId(companyVo.getId());
         userVo.setPhone(reqVo.getContactPhone());
-        userVo.setIsFirst(1);
+
         /*检查手机是否存在*/
-        userServiceImpl.checkPhone(userVo);
-        if (null!=reqVo.getUserId()){
+        /*userServiceImpl.checkPhone(userVo);*/
+        if (!StringHelper.isEmpty(reqVo.getUserId())){
             userDaoImpl.update(userVo);
         }else {
             userDaoImpl.create(userVo);
@@ -429,7 +436,7 @@ public class CompanyServiceImpl implements CompanyService {
         userVo.setAccount(reqVo.getAccount());
         userVo.setName(reqVo.getContactName());
         userVo.setPhone(reqVo.getContactPhone());
-        userServiceImpl.checkPhone(userVo);
+        /*userServiceImpl.checkPhone(userVo);*/
         userDaoImpl.update(userVo);
 
         resVo.setUserId(userVo.getId());
@@ -499,6 +506,7 @@ public class CompanyServiceImpl implements CompanyService {
 
             reqVo.setId(id);
             BankCardListReqVo reqVo1 = new BankCardListReqVo();
+            reqVo1.setCompanyId(reqVo.getCompanyId());
             PageSizeData<CompanyBankCardVo> companyBankCardDaoBankCardList = companyBankCardDao.getBankCardList(reqVo1);
 
             /*若该银行卡是第一张银行卡，则设为默认*/

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

@@ -148,8 +148,8 @@ public class UserServiceImpl implements UserService {
         UserGetReqVo userGetReqVo = new UserGetReqVo();
         userGetReqVo.setPhone(userVo.getPhone());
         UserVo userVo1 = userDao.load(userGetReqVo,UserVo.class);
-        if ((null != userVo1 && null == userVo.getId()) ||
-                (null != userVo1 && null != userVo.getId() && !userVo1.getId().equals(userVo.getId()))){
+        if ((!StringHelper.isEmpty(userVo1) && StringHelper.isEmpty(userVo.getId())) ||
+                (!StringHelper.isEmpty(userVo1) && !StringHelper.isEmpty(userVo.getId()) && !userVo1.getId().equals(userVo.getId()))){
             throw new CodeException("手机号"+userVo.getPhone()+"已存在");
         }
     }