Merge remote-tracking branch 'origin/master'

agent-manager/src/main/java/com/mortals/xhx/busiz/web/H5LoginController.java

@@ -205,8 +205,8 @@ public class H5LoginController extends BaseCRUDJsonBodyMappingController<UserSer
                 userEntity.setMobile(req.getPhone());
                 userEntity.setLoginPwd(SecurityUtil.md5DoubleEncoding("123"));
                 userEntity.setUserType(2);
-                CompanyEntity companyEntity = companyService.getCompanyByH5(req);
-                userEntity.setCompanyId(companyEntity.getId());
+//                CompanyEntity companyEntity = companyService.getCompanyByH5(req);
+//                userEntity.setCompanyId(companyEntity.getId());
                 userEntity.setRoleIds("2");
                 userEntity = userService.save(userEntity);
 
@@ -229,7 +229,7 @@ public class H5LoginController extends BaseCRUDJsonBodyMappingController<UserSer
                     && ObjectUtils.isEmpty(userEntity.getCompanyId())) {
                 //todo 当前用户存在 但是未绑定公司 可绑定
                 CompanyEntity companyEntity = companyService.getCompanyByH5(req);
-                userEntity.setCompanyId(companyEntity.getId());
+                userEntity.setCompanyId(companyEntity==null?null:companyEntity.getId());
                 userEntity.setRoleIds("2");
                 userService.update(userEntity);
             }

agent-manager/src/main/java/com/mortals/xhx/module/company/service/impl/CompanyServiceImpl.java

 package com.mortals.xhx.module.company.service.impl;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.busiz.req.H5Req;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.module.company.model.CompanyQuery;
@@ -30,16 +31,20 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
 
     @Override
     public CompanyEntity getCompanyByH5(H5Req req) {
-        CompanyEntity companyEntity = this.selectOne(new CompanyQuery().parkId(req.getParkId()).applyName(req.getApplyName()).phone(req.getPhone()));
-        if(ObjectUtils.isEmpty(companyEntity)){
-            companyEntity = new CompanyEntity();
-            companyEntity.initAttrValue();
-            BeanUtils.copyProperties(req, companyEntity, BeanUtil.getNullPropertyNames(req));
-            companyEntity.setCreateTime(new Date());
-            companyEntity.setCreateUserId(1L);
-            return this.save(companyEntity);
+        if(req.getParkId()!=null && StringUtils.isNotEmpty(req.getApplyName()) && StringUtils.isNotEmpty(req.getPhone())) {
+            CompanyEntity companyEntity = this.selectOne(new CompanyQuery().parkId(req.getParkId()).applyName(req.getApplyName()).phone(req.getPhone()));
+            if (ObjectUtils.isEmpty(companyEntity)) {
+                companyEntity = new CompanyEntity();
+                companyEntity.initAttrValue();
+                BeanUtils.copyProperties(req, companyEntity, BeanUtil.getNullPropertyNames(req));
+                companyEntity.setCreateTime(new Date());
+                companyEntity.setCreateUserId(1L);
+                return this.save(companyEntity);
+            } else {
+                return companyEntity;
+            }
         }else {
-            return companyEntity;
+            return null;
         }
     }
 }
\ No newline at end of file