Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/controller/ExpScoreController.java

@@ -102,11 +102,13 @@ public class ExpScoreController extends JeecgController<ExpScore, IExpScoreServi
 		queryWrappereg.eq("ann_comp_groupid",annComGroTop.getAnnComPG());
 		List<ExpGroup> listeg = expGroupService.list(queryWrappereg);
 		ExpScore expScorelist = new ExpScore();
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		QueryWrapper<ExpScore> queryWrapperlist = QueryGenerator.initQueryWrapper(expScorelist, req.getParameterMap());
 		queryWrapperlist.eq("annid",annComGroTop.getAnnid());
 		queryWrapperlist.eq("annal_comp",annualCompPointService.getById(annComGroTop.getAnnComP()).getAnnualCompId());
 		queryWrapperlist.eq("ann_com_p",annComGroTop.getAnnComP());
 		queryWrapperlist.eq("topid",annComGroTop.getTopid());
+		queryWrapperlist.eq("userid",sysUser.getId());
 		List<ExpScore> listeslist = expScoreService.list(queryWrapperlist);
 		if(listeslist.size()==0){
 			AnnComGroTopP annComGroTopP = new AnnComGroTopP();
@@ -158,7 +160,7 @@ public class ExpScoreController extends JeecgController<ExpScore, IExpScoreServi
 			}
 		}
 
-		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
 		QueryWrapper<ExpScore> queryWrapper = QueryGenerator.initQueryWrapper(expScore, req.getParameterMap());
 		queryWrapper.eq("annid",annComGroTop.getAnnid());
 		queryWrapper.eq("annal_comp",annualCompPointService.getById(annComGroTop.getAnnComP()).getAnnualCompId());