user/role/tright 7.24

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

@@ -109,6 +109,11 @@ public class CompanyServiceImpl implements CompanyService {
             userVo.setPassword("");
             userVo.setRemark("");
             resVo.setUserVo(userVo);
+        }else {
+            UserGetReqVo userGetReqVo1 = new UserGetReqVo();
+            userGetReqVo1.setCompanyId(reqVo.getId());
+            UserVo userVo1 = userDaoImpl.load(userGetReqVo1,UserVo.class);
+            resVo.setUserVo(userVo1);
         }
         /*获取没有公司id的角色数组*/
         GetEmptyRolesReqVo getEmptyRolesReqVo = new GetEmptyRolesReqVo();
@@ -193,6 +198,7 @@ public class CompanyServiceImpl implements CompanyService {
         CompanyReqVo companyReqVo = new CompanyReqVo();
         companyReqVo.setBankList(new ArrayList<CompanyBankReqVo>());
         ObjectHelper.writeWithFrom(companyReqVo, companyVo);
+        companyReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
 
         /*银行卡*/
         if (reqVo.getCompanyType() == 1) {
@@ -219,6 +225,7 @@ public class CompanyServiceImpl implements CompanyService {
         ObjectHelper.writeWithFrom(companyVo1,res);
         companyVo1.setProductOrInterface(companyVo.getProductOrInterface());
         companyVo1.setExamineStatus(companyVo.getExamineStatus());
+        companyVo1.setCompanyAttribute(companyReqVo.getCompanyAttribution());
 
         /*保存公司主表*/
         companyDao.create(companyVo1);
@@ -279,6 +286,7 @@ public class CompanyServiceImpl implements CompanyService {
         userVo.setCreateName(reqVo.getCreateName());
         userVo.setCompanyId(companyVo.getId());
         userVo.setPhone(reqVo.getContactPhone());
+        userVo.setIsFirst(1);
         /*检查手机是否存在*/
         userServiceImpl.checkPhone(userVo);
         userDaoImpl.create(userVo);