bug修复

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

@@ -11,17 +11,13 @@ import cn.com.ty.lift.system.homepage.dao.model.CountDataModel;
 import cn.com.ty.lift.system.homepage.dao.model.LiftMapDataModel;
 import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import cn.com.ty.lift.system.settings.dao.entity.MtCompanyAttestation;
-import cn.com.ty.lift.system.settings.dao.entity.model.CompanyActiveVo;
-import cn.com.ty.lift.system.settings.dao.entity.model.ConfirmCompanyResponse;
-import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest;
-import cn.com.ty.lift.system.settings.dao.entity.model.TeamInfoResponse;
+import cn.com.ty.lift.system.settings.dao.entity.model.*;
 import cn.com.ty.lift.system.settings.dao.mapper.MaintenanceCompanyMapper;
 import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
 import cn.com.ty.lift.system.settings.service.IMtCompanyAttestationService;
 import cn.com.ty.lift.system.user.dao.entity.MtCompanyUser;
 import cn.com.ty.lift.system.user.dao.entity.Role;
 import cn.com.ty.lift.system.user.dao.entity.UserRole;
-import cn.com.ty.lift.system.user.dao.entity.model.MenuRequest;
 import cn.com.ty.lift.system.user.service.*;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -75,6 +71,9 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
     @Resource
     private HomeLiftDataMapper homeLiftDataMapper;
 
+    @Resource
+    private MtCompanyAttestationServiceImpl mtCompanyAttestationServiceImpl;
+
     @Override
     public RestResponse list(MaintenanceCompanyRequest maintenanceCompanyRequest) {
         IPage<MaintenanceCompany> maintenanceCompanyPage = new Page<>(
@@ -165,7 +164,14 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         maintenanceCompany.setContractEndDate(maintenanceCompanyRequest.getContractEndDate());
         //更新企业菜单信息
         String menuIds = menuService.getAllMenuButtonIds(maintenanceCompanyRequest.getMenuIds());
-        menuService.companyMenu(new MenuRequest(companyId, menuIds));
+        // 重新分配菜单和角色
+        CompanyAttestationRequest companyAttestationRequest = new CompanyAttestationRequest();
+        companyAttestationRequest.setDefaultAssign(0);
+        companyAttestationRequest.setMenuIds(menuIds);
+        //删除原有分配的角色
+        roleService.remove(new QueryWrapper<Role>().lambda().eq(Role::getCompanyId, companyId));
+        //重新分配菜单和角色
+        mtCompanyAttestationServiceImpl.assignRoleAndMenu(companyAttestationRequest, companyId);
         this.updateById(maintenanceCompany);
         return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "更新公司信息成功");
     }
@@ -452,8 +458,8 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
                 //总停保台量
                 long totalStopLiftNum = liftMapDataModels.stream()
                         .filter(liftMapDataModel ->
-                             StringUtils.isNotBlank(liftMapDataModel.getLiftCompanyStatus()) &&
-                                    CommonEnum.LiftStatus.STOP_INSURANCE.getCode().equals(liftMapDataModel.getLiftCompanyStatus())).
+                                StringUtils.isNotBlank(liftMapDataModel.getLiftCompanyStatus()) &&
+                                        CommonEnum.LiftStatus.STOP_INSURANCE.getCode().equals(liftMapDataModel.getLiftCompanyStatus())).
                                 count();
                 //总活跃台量
                 long totalActiveLiftNum = totalLiftNum - totalStopLiftNum;

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

@@ -337,7 +337,7 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
      * @description 分配菜单和角色
      * @date 2020/4/26 10:57 上午
      */
-    private RestResponse assignRoleAndMenu(CompanyAttestationRequest companyAttestationRequest, Long companyId) {
+    protected RestResponse assignRoleAndMenu(CompanyAttestationRequest companyAttestationRequest, Long companyId) {
         int defaultAssign = companyAttestationRequest.getDefaultAssign();
         //1.分配默认角色
         List<Role> defaultRoleList = new ArrayList<>();