Merge branch 'master' of http://192.168.0.204/pd-new/pd-user

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

@@ -110,9 +110,9 @@ public class CompanyServiceImpl implements CompanyService {
         /*获取没有公司id的角色数组*/
         GetEmptyRolesReqVo getEmptyRolesReqVo = new GetEmptyRolesReqVo();
         List<RoleVo> roleVoList = roleDaoImpl.getEmptyRoles(getEmptyRolesReqVo);
-        if (null == roleVoList || roleVoList.isEmpty()){
+        /*if (null == roleVoList || roleVoList.isEmpty()){
             throw new CodeException("暂无未分配的角色，请先创建角色");
-        }
+        }*/
         resVo.setRoleVoList(roleVoList);
         return resVo;
     }
@@ -350,6 +350,7 @@ public class CompanyServiceImpl implements CompanyService {
         ObjectHelper.writeWithFrom(companyVo1,res);
         companyVo1.setProductOrInterface(companyVo.getProductOrInterface());
         companyVo1.setExamineStatus(companyVo.getExamineStatus());
+        companyVo1.setCompanyAttribute(companyVo.getCompanyAttribute());
         companyDao.update(companyVo1);
 
         /*更新银行卡表*/