Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MaintenanceCompanyServiceImpl.java

@@ -148,7 +148,11 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
     @Transactional
     public RestResponse updateMaintenanceCompany(MaintenanceCompanyRequest maintenanceCompanyRequest) {
         //获取公司id,前端传的字段是id
-        Long companyId = maintenanceCompanyRequest.getId();
+        MtCompanyAttestation mtCompanyAttestation = mtCompanyAttestationService.getById(maintenanceCompanyRequest.getId());
+        if(mtCompanyAttestation == null){
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "用户申请信息不存在");
+        }
+        Long companyId = mtCompanyAttestation.getMtCompanyId();
         MaintenanceCompany maintenanceCompany = this.getById(companyId);
         //更新vip标识
         maintenanceCompany.setVipFlag(maintenanceCompanyRequest.getVipFlag());
@@ -159,7 +163,8 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         //更新合同结束时间
         maintenanceCompany.setContractEndDate(maintenanceCompanyRequest.getContractEndDate());
         //更新企业菜单信息
-        menuService.companyMenu(new MenuRequest(companyId, maintenanceCompanyRequest.getMenuIds()));
+        String menuIds = menuService.getAllMenuButtonIds(maintenanceCompanyRequest.getMenuIds());
+        menuService.companyMenu(new MenuRequest(companyId, menuIds));
         this.updateById(maintenanceCompany);
         return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "更新公司信息成功");
     }