Merge branch 'hz_master' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -66,6 +66,15 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                 || appUserPositionTempDTO.getPositionId() == null || appUserPositionTempDTO.getPositionId() == 0) {
             return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
         }
+        Integer companyId=appUserPositionTempDTO.getCompanyId();
+        String companyName=appUserPositionTempDTO.getCompanyName();
+       if (!(companyId!=null&&companyId>0&&StringUtils.isNotBlank(companyName)))
+           return  ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
+        BranchCompany branchCompany=vehicleFeign.companyId(companyName);
+        if (branchCompany==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
+        }
+        companyId=branchCompany.getId();
         String phone = appUserPositionTempDTO.getPhone();
         Integer id = appUserPositionTempDTO.getId() == null ? 0 : appUserPositionTempDTO.getId();
         Example example = new Example(AppUserPositionTemp.class);
@@ -82,6 +91,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         AppUserPositionTemp userPositionTemp = new AppUserPositionTemp();
         BeanUtils.copyProperties(appUserPositionTempDTO, userPositionTemp);
         userPositionTemp.setUserId(userId);
+        userPositionTemp.setCompanyId(companyId);
         //编辑
         if (id == null || id == 0) {
             insertSelective(userPositionTemp);