From 794a2ec5fa219a0a87be0c72bd59602cb9f6c6dc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 05 三月 2024 14:19:08 +0800
Subject: [PATCH] 合并代码
---
cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
index e7eafa4..17ee0c5 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
@@ -80,7 +80,7 @@
List<String> condition5 = vo.getType5().getCondition();
QueryWrapper<HonorRules> wrapper5 = new QueryWrapper<>();
wrapper5.eq("type", type5);
- List<HonorRules> list5 = hrService.list(wrapper4);
+ List<HonorRules> list5 = hrService.list(wrapper5);
for (int i = 0; i < list5.size(); i++) {
list5.get(i).setCondition(Integer.valueOf(condition5.get(i)));
}
--
Gitblit v1.7.1