diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/student/tGkPicinfo/controller/TGkPicinfoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/student/tGkPicinfo/controller/TGkPicinfoController.java
index 29ec200..f1dc29b 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/student/tGkPicinfo/controller/TGkPicinfoController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/student/tGkPicinfo/controller/TGkPicinfoController.java
@@ -207,20 +207,28 @@ public class TGkPicinfoController extends JeecgController<TGkPicinfo, ITGkPicinf
 		//int yearI = Integer.parseInt(year);
 
 		//核心学生信息
-		List<TFreshman> freshmanList = tFreshmanService.query().list();
-		Map<String, TFreshman> freshmanMap = freshmanList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh()),(a) -> a, (a,b) -> a));
-		Map<String, TFreshman> freshmanMap2 = freshmanList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getKsh()),(a) -> a, (a,b) -> a));
-		Map<String, TFreshman> freshmanMap3 = freshmanList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getXh()),(a) -> a, (a,b) -> a));
+		QueryWrapper<TFreshman> tfqw = new QueryWrapper<>();
+		tfqw.lambda().eq(TFreshman::getNj, year);
+		List<TFreshman> freshmanList = tFreshmanService.list(tfqw);
+		Map<String, TFreshman> freshmanMap = freshmanList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh() + "-" + x.getNj()),(a) -> a, (a,b) -> a));
+		Map<String, TFreshman> freshmanMap2 = freshmanList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getKsh() + "-" + x.getNj()),(a) -> a, (a,b) -> a));
+		Map<String, TFreshman> freshmanMap3 = freshmanList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getXh() + "-" + x.getNj()),(a) -> a, (a,b) -> a));
 
 		//高考信息
-		List<TGkPicinfo> gkPicinfoList = tGkPicinfoService.query().list();
-		Map<String, TGkPicinfo> gkPicinfoMap = gkPicinfoList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh()),(a) -> a, (a,b) -> a));
+		QueryWrapper<TGkPicinfo> tgqw = new QueryWrapper<>();
+		tgqw.lambda().eq(TGkPicinfo::getNj, year);
+		List<TGkPicinfo> gkPicinfoList = tGkPicinfoService.list(tgqw);
+		Map<String, TGkPicinfo> gkPicinfoMap = gkPicinfoList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh() + "-" + x.getNj()),(a) -> a, (a,b) -> a));
 		//身份证信息
-		List<TSfzPicinfo> sfzPicinfoList = tSfzPicinfoService.query().list();
-		Map<String, TSfzPicinfo> sfzPicinfoMap = sfzPicinfoList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh()),(a) -> a, (a,b) -> a));
+		QueryWrapper<TSfzPicinfo> tsqw = new QueryWrapper<>();
+		tsqw.lambda().eq(TSfzPicinfo::getNj, year);
+		List<TSfzPicinfo> sfzPicinfoList = tSfzPicinfoService.list(tsqw);
+		Map<String, TSfzPicinfo> sfzPicinfoMap = sfzPicinfoList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh() + "-" + x.getNj()),(a) -> a, (a,b) -> a));
 		//学籍信息
-		List<TXjPicinfo> xjPicinfoList = tXjPicinfoService.query().list();
-		Map<String, TXjPicinfo> xjPicinfoMap = xjPicinfoList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh()),(a) -> a, (a,b) -> a));
+		QueryWrapper<TXjPicinfo> txqw = new QueryWrapper<>();
+		txqw.lambda().eq(TXjPicinfo::getNj, year);
+		List<TXjPicinfo> xjPicinfoList = tXjPicinfoService.list(txqw);
+		Map<String, TXjPicinfo> xjPicinfoMap = xjPicinfoList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh() + "-" + x.getNj()),(a) -> a, (a,b) -> a));
 
 		//获取文件列表（身份证列表）
 		//[/opt/upFiles/2023/东北师大/]
@@ -244,12 +252,12 @@ public class TGkPicinfoController extends JeecgController<TGkPicinfo, ITGkPicinf
 
 		gkFileMap.forEach((k,sourceFile) -> {
 			TFreshman freshman = null;
-			if(freshmanMap.containsKey(k)){
-				freshman = freshmanMap.get(k);
-			} else if(freshmanMap2.containsKey(k)){
-				freshman = freshmanMap2.get(k);
-			} else if(freshmanMap3.containsKey(k)){
-				freshman = freshmanMap3.get(k);
+			if(freshmanMap.containsKey(k + "-" + year)){
+				freshman = freshmanMap.get(k + "-" + year);
+			} else if(freshmanMap2.containsKey(k + "-" + year)){
+				freshman = freshmanMap2.get(k + "-" + year);
+			} else if(freshmanMap3.containsKey(k + "-" + year)){
+				freshman = freshmanMap3.get(k + "-" + year);
 			}
 			if(freshman != null){
 				//TFreshman freshman = freshmanMap.get(k);
@@ -265,8 +273,8 @@ public class TGkPicinfoController extends JeecgController<TGkPicinfo, ITGkPicinf
 				FileUtil.touch(toFile);
 				FileUtil.copyFile(sourceFile,toFile, StandardCopyOption.REPLACE_EXISTING);
 				//查询身份证信息
-				if(gkPicinfoMap.containsKey(freshman.getSfzh())){
-					TGkPicinfo gkPicinfo = gkPicinfoMap.get(freshman.getSfzh());
+				if(gkPicinfoMap.containsKey(freshman.getSfzh() + "-" + year)){
+					TGkPicinfo gkPicinfo = gkPicinfoMap.get(freshman.getSfzh() + "-" + year);
 					gkPicinfo.setGkurl(toFilePath);
 					updateTGkPicinfoList.add(gkPicinfo);
 				}else {
@@ -277,6 +285,7 @@ public class TGkPicinfoController extends JeecgController<TGkPicinfo, ITGkPicinf
 					gkPicinfo.setZymc(freshman.getZymc());
 					gkPicinfo.setGkurl(toFilePath);
 					gkPicinfo.setGkflag("0");
+					gkPicinfo.setNj(year);
 					addTGkPicinfoList.add(gkPicinfo);
 				}
 			}
@@ -284,12 +293,12 @@ public class TGkPicinfoController extends JeecgController<TGkPicinfo, ITGkPicinf
 
 		idCardFileMap.forEach((k,sourceFile) -> {
 			TFreshman freshman = null;
-			if(freshmanMap.containsKey(k)){
-				freshman = freshmanMap.get(k);
-			} else if(freshmanMap2.containsKey(k)){
-				freshman = freshmanMap2.get(k);
-			} else if(freshmanMap3.containsKey(k)){
-				freshman = freshmanMap3.get(k);
+			if(freshmanMap.containsKey(k + "-" + year)){
+				freshman = freshmanMap.get(k + "-" + year);
+			} else if(freshmanMap2.containsKey(k + "-" + year)){
+				freshman = freshmanMap2.get(k + "-" + year);
+			} else if(freshmanMap3.containsKey(k + "-" + year)){
+				freshman = freshmanMap3.get(k + "-" + year);
 			}
 			if(freshman != null){
 				//TFreshman freshman = freshmanMap.get(k);
@@ -305,8 +314,8 @@ public class TGkPicinfoController extends JeecgController<TGkPicinfo, ITGkPicinf
 				FileUtil.touch(toFile);
 				FileUtil.copyFile(sourceFile,toFile, StandardCopyOption.REPLACE_EXISTING);
 				//查询身份证信息
-				if(sfzPicinfoMap.containsKey(freshman.getSfzh())){
-					TSfzPicinfo sfzPicinfo = sfzPicinfoMap.get(freshman.getSfzh());
+				if(sfzPicinfoMap.containsKey(freshman.getSfzh() + "-" + year)){
+					TSfzPicinfo sfzPicinfo = sfzPicinfoMap.get(freshman.getSfzh() + "-" + year);
 					sfzPicinfo.setSfzurl(toFilePath);
 					updateSfzPicinfoList.add(sfzPicinfo);
 				}else {
@@ -324,12 +333,12 @@ public class TGkPicinfoController extends JeecgController<TGkPicinfo, ITGkPicinf
 
 		xjFileMap.forEach((k,sourceFile) -> {
 			TFreshman freshman = null;
-			if(freshmanMap.containsKey(k)){
-				freshman = freshmanMap.get(k);
-			} else if(freshmanMap2.containsKey(k)){
-				freshman = freshmanMap2.get(k);
-			} else if(freshmanMap3.containsKey(k)){
-				freshman = freshmanMap3.get(k);
+			if(freshmanMap.containsKey(k + "-" + year)){
+				freshman = freshmanMap.get(k + "-" + year);
+			} else if(freshmanMap2.containsKey(k + "-" + year)){
+				freshman = freshmanMap2.get(k + "-" + year);
+			} else if(freshmanMap3.containsKey(k + "-" + year)){
+				freshman = freshmanMap3.get(k + "-" + year);
 			}
 			if(freshman != null){
 				//TFreshman freshman = freshmanMap.get(k);
@@ -345,8 +354,8 @@ public class TGkPicinfoController extends JeecgController<TGkPicinfo, ITGkPicinf
 				FileUtil.touch(toFile);
 				FileUtil.copyFile(sourceFile,toFile, StandardCopyOption.REPLACE_EXISTING);
 				//查询身份证信息
-				if(xjPicinfoMap.containsKey(freshman.getSfzh())){
-					TXjPicinfo xjPicinfo = xjPicinfoMap.get(freshman.getSfzh());
+				if(xjPicinfoMap.containsKey(freshman.getSfzh() + "-" + year)){
+					TXjPicinfo xjPicinfo = xjPicinfoMap.get(freshman.getSfzh() + "-" + year);
 					xjPicinfo.setXjurl(toFilePath);
 					updateXjPicinfoList.add(xjPicinfo);
 				}else {
@@ -357,6 +366,7 @@ public class TGkPicinfoController extends JeecgController<TGkPicinfo, ITGkPicinf
 					xjPicinfo.setZymc(freshman.getZymc());
 					xjPicinfo.setXjurl(toFilePath);
 					xjPicinfo.setXjflag("0");
+					xjPicinfo.setNj(year);
 					addXjPicinfoList.add(xjPicinfo);
 				}
 			}