Sfoglia il codice sorgente

问题修改;代码优化;

wangcahngsheng 1 anno fa
parent
commit
15c15b820c

+ 10 - 4
ims-service/ims-eval/src/main/java/com/ims/eval/controller/DepartmentalPerformanceIndicatorPlanController.java

@@ -255,21 +255,27 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	 */
 	@GetMapping(value = "/detailDeptData")
 	public R detailDeptData(@RequestParam(value = "deptId") String deptId) {
-		Map<String, String> map = new LinkedHashMap<>();
+		List<DeptDTO> deptList = new ArrayList<>();
 		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 		qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
 		qw.lambda().orderByAsc(EvaluationDept::getSerialNumber);
 		List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
 		for (EvaluationDept evaluationDept : evaluationDeptList) {
 			if ("23031009".equals(deptId)) {//组织人事部
-				map.put(evaluationDept.getDeptId(), evaluationDept.getDeptName());
+				DeptDTO dept = new DeptDTO();
+				dept.setDeptId(evaluationDept.getDeptId());
+				dept.setDeptName(evaluationDept.getDeptName());
+				deptList.add(dept);
 			} else {
 				if (deptId.equals(evaluationDept.getDeptId())) {
-					map.put(evaluationDept.getDeptId(), evaluationDept.getDeptName());
+					DeptDTO dept = new DeptDTO();
+					dept.setDeptId(evaluationDept.getDeptId());
+					dept.setDeptName(evaluationDept.getDeptName());
+					deptList.add(dept);
 				}
 			}
 		}
-		return R.ok().data(map);
+		return R.ok().data(deptList);
 	}
 
 	/**