Browse Source

问题修改;代码优化;

wangcahngsheng 1 year ago
parent
commit
2571e19094

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

@@ -254,7 +254,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	 */
 	@GetMapping(value = "/detailDeptData")
 	public R detailDeptData(@RequestParam(value = "deptId") String deptId) {
-		Map<String, String> map = new HashMap<>();
+		Map<String, String> map = new LinkedHashMap<>();
 		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 		qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
 		qw.lambda().orderByAsc(EvaluationDept::getSerialNumber);

+ 9 - 4
ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluationNoticeServiceImpl.java

@@ -156,10 +156,15 @@ public class EvaluationNoticeServiceImpl extends ServiceImpl<EvaluationNoticeMap
 							docFileNames.append(memo4Str[i]).append(",");
 						}
 					}
-					String docPathStr = docPaths.toString().substring(0, docPaths.toString().length() - 1);
-					evaluationNotice.setNoticeAnnex(docPathStr);
-					String docFileNameStr = docFileNames.toString().substring(0, docFileNames.toString().length() - 1);
-					evaluationNotice.setMemo4(docFileNameStr);
+					if (docPaths.toString().length() > 0 && docFileNames.toString().length() > 0) {
+						String docPathStr = docPaths.toString().substring(0, docPaths.toString().length() - 1);
+						evaluationNotice.setNoticeAnnex(docPathStr);
+						String docFileNameStr = docFileNames.toString().substring(0, docFileNames.toString().length() - 1);
+						evaluationNotice.setMemo4(docFileNameStr);
+					} else {
+						evaluationNotice.setNoticeAnnex("");
+						evaluationNotice.setMemo4("");
+					}
 					baseMapper.updateById(evaluationNotice);
 				}
 			}