diff --git a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
index b959dd4..87e2091 100644
--- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
@@ -102,7 +102,7 @@
- order by a.id desc
+ order by a.create_time desc
diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
index 8ced1bd..0fb0c87 100644
--- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
@@ -94,7 +94,7 @@
#{deptId}
- order by c.id desc
+ order by c.create_time desc
diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/appmodule/AppAppModuleController.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/appmodule/AppAppModuleController.java
index 91ba5ad..ecb8d1e 100644
--- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/appmodule/AppAppModuleController.java
+++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/appmodule/AppAppModuleController.java
@@ -44,6 +44,11 @@ public class AppAppModuleController {
* 园林巡查员角色ID
*/
private static final Long ROLE_ID_PATROL = 178L;
+
+ /**
+ * 园林巡查员角色ID
+ */
+ private static final Long ROLE_ID_PATROL_ZX = 202L;
/**
* 全域督察员角色ID
*/
@@ -64,28 +69,28 @@ public class AppAppModuleController {
public CommonResult> getAppModuleList(AppModuleListReqVO reqVO) {
// 获取当前登录用户ID
Long userId = SecurityFrameworkUtils.getLoginUserId();
-
+
// 查询用户可见的模块列表
List list = appModuleService.getVisibleAppModuleList(userId, reqVO);
-
+
// 如果用户同时拥有园林巡查员(178)和全域督察员(183)角色,则隐藏巡查工单菜单,只显示督查工单菜单
if (userId != null) {
Set roleIds = permissionService.getUserRoleIdListByUserId(userId);
- if (roleIds.contains(ROLE_ID_PATROL) && roleIds.contains(ROLE_ID_INSPECTOR)) {
+ if (roleIds.contains(ROLE_ID_PATROL_ZX) && roleIds.contains(ROLE_ID_INSPECTOR)) {
log.info("[getAppModuleList] 用户({})同时拥有巡查员和督察员角色,隐藏巡查工单菜单", userId);
list.removeIf(module -> MODULE_ID_PATROL_WORKORDER.equals(module.getId()));
}
}
-
+
// 填充统计数据(根据extra中的statisticKey配置)
// appModuleService.fillModuleStatistics(list, userId);
-
+
// 转换为 VO 列表并构建树
List modules = AppModuleConvert.INSTANCE.convertAppList(list);
List moduleTree = buildModuleTree(modules);
-
+
// MapStruct 转换已通过 @AfterMapping 自动填充 statisticCount
-
+
return success(moduleTree);
}
diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java
index aa3ec2f..bf20f73 100644
--- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java
+++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java
@@ -197,8 +197,21 @@ public class MainInfoController {
Map bpmTaskRespVOS = bpmTaskApi.getLastTaskMapByProcessInstanceId(processInstanceIdList);
- // 5. 转换并返回结果
- return success(MainInfoConvert.INSTANCE.buildMainInfoPage(pageResult, attachmentMap, bpmTaskRespVOS));
+ // 5. 查询单位名称
+ Map companyNameMap = pageResult.getList().stream()
+ .map(MainInfoDO::getCompanyId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toMap(
+ companyId -> companyId,
+ companyId -> {
+ DeptDO dept = deptService.getDept(companyId);
+ return dept != null ? dept.getName() : "";
+ }
+ ));
+
+ // 6. 转换并返回结果
+ return success(MainInfoConvert.INSTANCE.buildMainInfoPage(pageResult, attachmentMap, bpmTaskRespVOS, companyNameMap));
}
@GetMapping("/export-excel")
diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java
index 4d282cc..55dd407 100644
--- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java
+++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java
@@ -25,7 +25,7 @@ public interface MainInfoConvert {
MainInfoConvert INSTANCE = Mappers.getMapper(MainInfoConvert.class);
- default PageResult buildMainInfoPage(PageResult pageResult, Map attachmentMap, Map bpmTaskRespVOS ) {
+ default PageResult buildMainInfoPage(PageResult pageResult, Map attachmentMap, Map bpmTaskRespVOS, Map companyNameMap) {
List mainInfoVOList = CollectionUtils.convertList(pageResult.getList(), mainInfoDO -> {
AdminMainInfoRespVO mainInfoVo = BeanUtils.toBean(mainInfoDO, AdminMainInfoRespVO.class);
if (attachmentMap != null && !attachmentMap.isEmpty()) {
@@ -48,6 +48,9 @@ public interface MainInfoConvert {
}
}
}
+ if (companyNameMap != null && mainInfoDO.getCompanyId() != null) {
+ mainInfoVo.setCompanyName(companyNameMap.getOrDefault(mainInfoDO.getCompanyId(), ""));
+ }
return mainInfoVo;
});
return new PageResult<>(mainInfoVOList, pageResult.getTotal());