提交

src/main/java/cn/timer/api/controller/LoginController.java

@@ -856,46 +856,48 @@ public class LoginController {
 				zas.stream().forEach(o -> menus.add(o.getMenuId()));
 				qyzxEmpLogin1.setMenus(menus);
 				
-				List<MenuStructureDto> mestrs = new ArrayList<MenuStructureDto>();
-				
-				List<QyzxAdminMenu> qyme = QyzxAdminMenu.builder().build().selectList(new QueryWrapper<QyzxAdminMenu>().lambda().eq(QyzxAdminMenu::getOrgCode, qyzxEmpLogin1.getOrgId()).orderByAsc(QyzxAdminMenu::getSortNumber));
-				String[] zdy = new String[qyme.size()];
-				int i  = 0;
-				for(QyzxAdminMenu me : qyme) {
+			}
+		}
+		
+		
+		List<MenuStructureDto> mestrs = new ArrayList<MenuStructureDto>();
+		List<QyzxAdminMenu> qyme = QyzxAdminMenu.builder().build().selectList(new QueryWrapper<QyzxAdminMenu>().lambda().eq(QyzxAdminMenu::getOrgCode, qyzxEmpLogin1.getOrgId()).orderByAsc(QyzxAdminMenu::getSortNumber));
+		String[] zdy = new String[qyme.size()];
+		int i  = 0;
+		for(QyzxAdminMenu me : qyme) {
+			MenuStructureDto metr = MenuStructureDto.builder().build();
+			metr.setMenu_code(me.getMenuCode());
+			metr.setMenu_name(me.getMenuName());
+			metr.setSort_number(me.getSortNumber());
+			metr.setPath("");
+			mestrs.add(metr);
+			zdy[i] = me.getMenuCode();
+			i++;
+		}	
+		//
+		List<AdminMenuTemplate> adtes = AdminMenuTemplate.builder().build().selectList(new QueryWrapper<AdminMenuTemplate>().lambda().eq(AdminMenuTemplate::getEnable, 1));
+		for(AdminMenuTemplate adm : adtes) {
+			
+			if(!ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(zdy), adm.getMenuCode())) {
+				if(adm.getDistribution() == 0 && qyzxEmpLogin1.getOrgId() == 3) {
 					MenuStructureDto metr = MenuStructureDto.builder().build();
-					metr.setMenu_code(me.getMenuCode());
-					metr.setMenu_name(me.getMenuName());
-					metr.setSort_number(me.getSortNumber());
+					metr.setMenu_code(adm.getMenuCode());
+					metr.setMenu_name(adm.getMenuName());
+					metr.setSort_number(adm.getSortNumber());
+					metr.setPath("");
+					mestrs.add(metr);
+				}else if(adm.getDistribution() == 1) {
+					MenuStructureDto metr = MenuStructureDto.builder().build();
+					metr.setMenu_code(adm.getMenuCode());
+					metr.setMenu_name(adm.getMenuName());
+					metr.setSort_number(adm.getSortNumber());
 					metr.setPath("");
 					mestrs.add(metr);
-					zdy[i] = me.getMenuCode();
-					i++;
-				}	
-				//
-				List<AdminMenuTemplate> adtes = AdminMenuTemplate.builder().build().selectList(new QueryWrapper<AdminMenuTemplate>().lambda().eq(AdminMenuTemplate::getEnable, 1));
-				for(AdminMenuTemplate adm : adtes) {
-					
-					if(!ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(zdy), adm.getMenuCode())) {
-						if(adm.getDistribution() == 0 && qyzxEmpLogin1.getOrgId() == 3) {
-							MenuStructureDto metr = MenuStructureDto.builder().build();
-							metr.setMenu_code(adm.getMenuCode());
-							metr.setMenu_name(adm.getMenuName());
-							metr.setSort_number(adm.getSortNumber());
-							metr.setPath("");
-							mestrs.add(metr);
-						}else if(adm.getDistribution() == 1) {
-							MenuStructureDto metr = MenuStructureDto.builder().build();
-							metr.setMenu_code(adm.getMenuCode());
-							metr.setMenu_name(adm.getMenuName());
-							metr.setSort_number(adm.getSortNumber());
-							metr.setPath("");
-							mestrs.add(metr);
-						}
-					}
 				}
-				qyzxEmpLogin1.setMenstr(mestrs);
 			}
 		}
+		qyzxEmpLogin1.setMenstr(mestrs);
+		
 		// 可操作企业
 
 		// 需要更新最后一次登陆信息