bug修复

src/main/java/com/xjrsoft/module/system/service/impl/MenuServiceImpl.java

@@ -11,11 +11,13 @@ import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.toolkit.MPJWrappers;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.enums.AuthorizeType;
+import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.enums.RoleEnum;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.WhitelistManagement;
 import com.xjrsoft.module.base.service.IWhitelistManagementService;
+import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.organization.entity.UserRoleRelation;
 import com.xjrsoft.module.organization.mapper.UserRoleRelationMapper;
 import com.xjrsoft.module.system.dto.MenuTreeDto;
@@ -23,6 +25,7 @@ import com.xjrsoft.module.system.dto.RoleMenuServeListDto;
 import com.xjrsoft.module.system.entity.Authorize;
 import com.xjrsoft.module.system.entity.Menu;
 import com.xjrsoft.module.system.entity.Subsystem;
+import com.xjrsoft.module.system.entity.XjrMenuDeptRelation;
 import com.xjrsoft.module.system.entity.XjrMenuGroup;
 import com.xjrsoft.module.system.entity.XjrMenuGroupSet;
 import com.xjrsoft.module.system.entity.XjrMenuQuick;
@@ -216,18 +219,24 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
         List<String> orderList = new ArrayList<>();
         orderList.add("t1.sort_code");orderList.add("t.sort_code");
         List<MenuVo> menuVos = this.selectJoinList(MenuVo.class,
-            MPJWrappers.<Menu>lambdaJoin()
+            MPJWrappers.<Menu>lambdaJoin().disableSubLogicDel()
             .like(StrUtil.isNotBlank(dto.getTitle()), Menu::getTitle, dto.getTitle())
             .like(StrUtil.isNotBlank(dto.getCode()), Menu::getCode, dto.getCode())
             .like(StrUtil.isNotBlank(dto.getName()), Menu::getName, dto.getName())
             .eq(ObjectUtil.isNotEmpty(dto.getSystemType()), Menu::getSystemType, dto.getSystemType())
             .eq(ObjectUtil.isNotEmpty(dto.getDisplay()), Menu::getDisplay, dto.getDisplay())
+            .eq( Menu::getDeleteMark, DeleteMark.NODELETE.getCode())
+            .eq(Subsystem::getDeleteMark, DeleteMark.NODELETE.getCode())
             .in(CollectionUtils.isNotEmpty(authMenuIdList), Menu::getId, authMenuIdList)
             .select(Menu::getId)
             .select("1 as authorized")
             .selectAs(Subsystem::getName, MenuVo::getSystemName)
+            .selectAs(Department::getName, MenuVo::getDeptName)
+            .selectAs(Department::getId, MenuVo::getDeptId)
             .select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuTreeVo.class).contains(x.getProperty()))
             .leftJoin(Subsystem.class, Subsystem::getId, Menu::getSystemId)
+            .leftJoin("xjr_menu_dept_relation t2 ON t2.menu_id = t.id AND t2.delete_mark = 0  ")
+            .leftJoin("xjr_department t3 ON t3.id = t2.dept_id")
             .eq(Menu::getEnabledMark, EnabledMark.ENABLED.getCode())
             .orderByAscStr(orderList)
         );