部门缓存代码更新

src/main/java/org/springblade/common/cache/DeptCache.java

@@ -46,13 +46,22 @@ public class DeptCache {
 	}
 
 	/**
-	 * 获取用户
+	 * 获取部门
 	 *
-	 * @param DeptId 用户id
+	 * @param DeptId 部门
 	 * @return
 	 */
 	public static Dept getDept(Long DeptId) {
 		return CacheUtil.get(DEPT_CACHE, DEPT_CACHE_ID, DeptId, () -> DeptService.getById(DeptId));
 	}
+	/**
+	 * 获取部门
+	 *
+	 * @param DeptId 部门
+	 * @return
+	 */
+	public static Dept getDept(String DeptId) {
+		return CacheUtil.get(DEPT_CACHE, DEPT_CACHE_ID, DeptId, () -> DeptService.getById(DeptId));
+	}
 
 }

src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java

@@ -26,6 +26,7 @@ import org.springblade.modules.business.pojo.vo.workorder.WorkOrderVO;
 import org.springblade.modules.business.service.IWorkOrderApprovalService;
 import org.springblade.modules.business.service.IWorkOrderFlowService;
 import org.springblade.modules.business.service.IWorkOrderService;
+import org.springblade.modules.system.pojo.entity.Dept;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.BufferedReader;
@@ -143,10 +144,10 @@ public class WorkOrderController extends BladeController {
 		// 执行分页查询
 		IPage<WorkOrder> pages = workOrderService.page(Condition.getPage(query), wrapper);
 
-
 		pages.getRecords().forEach(order -> {
-			if (Func.isNotEmpty(order.getReportUnit())) {
+			Dept dept = DeptCache.getDept(order.getReportUnit());
-				order.setReportUnitName(DeptCache.getDept(Long.parseLong(order.getReportUnit())).getDeptName());
+			if (Func.isNotEmpty(dept)) {
+				order.setReportUnitName(dept.getDeptName());
 			}
 		});