Browse Source

解决问题-默认审核

黄远 5 years ago
parent
commit
8b9087b236

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

@@ -351,7 +351,7 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
 
         //2.给企业分配菜单
         String menuIds = companyAttestationRequest.getMenuIds();
-        if (0 == defaultAssign) {
+        if (1 == defaultAssign) {
             menuIds = ProjectUtils.arrayToStrByComma(DefaultMenuConstants.ENTERPRISE_MENUIDS);
         }
         RestResponse restResponse = menuService.companyMenu(new MenuRequest(companyId, menuIds));

+ 2 - 2
lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/MenuService.java

@@ -108,7 +108,7 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> implements IMenuS
         List<Long> companyMenuIds = ProjectUtils.getAttrList(needDeleteCompanyMenuList, "id", null);
         if (companyMenuIds.size() > 0) {
             if(!companyMenuService.removeByIds(companyMenuIds)){
-               return RestResponse.fail(ApiConstants.RESULT_ERROR, "操作失败");
+               return RestResponse.fail(ApiConstants.RESULT_ERROR, "删除公司菜单关联关系失败");
             }
         }
         //获取菜单id列表
@@ -126,7 +126,7 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> implements IMenuS
         if (needSaveCompanyMenuList.size() > 0) {
             if(!companyMenuService.saveBatch(needSaveCompanyMenuList)){
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return RestResponse.fail(ApiConstants.RESULT_ERROR, "操作失败");
+                return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存公司菜单关系失败");
             }
         }
         return null;

+ 1 - 1
lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/RoleService.java

@@ -222,7 +222,7 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> implements IRoleS
     @Override
     public boolean assignDefaultMenu(int defaultAssign, List<Role> defaultRoleList, Role enterpriseAdminRole) {
         List<RoleMenu> needSaveRoleMenuList = new ArrayList<>();
-        if (1 == defaultAssign) {
+        if (0 == defaultAssign) {
             //如果是手动方式,则只给企业管理员分配菜单
             defaultRoleList = new ArrayList<>();
         }