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/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java

@@ -13,6 +13,8 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluationCollect;
 import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationCollectService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -35,6 +37,9 @@ public class PersonalAbilityEvaluationCollectController extends JeecgController<
     @Autowired
     private IPersonalAbilityEvaluationCollectService personalAbilityEvaluationCollectService;
 
+    @Autowired
+    private ISysUserService iSysUserService;
+
     /**
      * 分页列表查询
      *
@@ -76,7 +81,8 @@ public class PersonalAbilityEvaluationCollectController extends JeecgController<
                                                                          HttpServletRequest req) {
         QueryWrapper<PersonalAbilityEvaluationCollect> queryWrapper = QueryGenerator.initQueryWrapper(personalAbilityEvaluationCollect, req.getParameterMap());
         LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.eq("work_on",user.getUsername());
+        SysUser user1 = iSysUserService.getById(user.getId());
+        queryWrapper.eq("work_on",user1.getWorkNo());
         Page<PersonalAbilityEvaluationCollect> page = new Page<PersonalAbilityEvaluationCollect>(pageNo, pageSize);
         IPage<PersonalAbilityEvaluationCollect> pageList = personalAbilityEvaluationCollectService.page(page, queryWrapper);
         return Result.OK(pageList);

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java

@@ -15,6 +15,8 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.demo.annualScore.entity.PersonalCompTotalScore;
 import org.jeecg.modules.demo.annualScore.service.IPersonalCompTotalScoreService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -37,6 +39,9 @@ public class PersonalCompTotalScoreController extends JeecgController<PersonalCo
     @Autowired
     private IPersonalCompTotalScoreService personalCompTotalScoreService;
 
+    @Autowired
+    private ISysUserService iSysUserService;
+
     /**
      * 分页列表查询
      *
@@ -79,7 +84,8 @@ public class PersonalCompTotalScoreController extends JeecgController<PersonalCo
                                                                HttpServletRequest req) {
         QueryWrapper<PersonalCompTotalScore> queryWrapper = QueryGenerator.initQueryWrapper(personalCompTotalScore, req.getParameterMap());
         LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.eq("work_on",user.getUsername());
+        SysUser user1 = iSysUserService.getById(user.getId());
+        queryWrapper.eq("work_on",user1.getWorkNo());
         Page<PersonalCompTotalScore> page = new Page<PersonalCompTotalScore>(pageNo, pageSize);
         IPage<PersonalCompTotalScore> pageList = personalCompTotalScoreService.page(page, queryWrapper);
         return Result.OK(pageList);

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java

@@ -494,6 +494,21 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
 				List<AwardPersion> list = ExcelImportUtil.importExcel(file.getInputStream(), AwardPersion.class, params);
 				List<AwardPersion> listsave = new ArrayList<>();
 				for(int i = 0 ; i < list.size() ; i++){
+					if(list.get(i).getAnnualid()==null||list.get(i).getAnnualid().equals("")){
+						return Result.error("文件导入失败:第"+(i+1)+"行年度为空");
+					}
+					if(list.get(i).getAnnalComp()==null||list.get(i).getAnnalComp().equals("")){
+						return Result.error("文件导入失败:第"+(i+1)+"行年度比赛为空");
+					}
+					if(list.get(i).getAnnualCompP()==null||list.get(i).getAnnualCompP().equals("")){
+						return Result.error("文件导入失败:第"+(i+1)+"行年度比赛项目为空");
+					}
+					if(list.get(i).getEnrollCode()==null||list.get(i).getEnrollCode().equals("")){
+						return Result.error("文件导入失败:第"+(i+1)+"行报名编号为空");
+					}
+					if(list.get(i).getAwardname()==null||list.get(i).getAwardname().equals("")){
+						return Result.error("文件导入失败:第"+(i+1)+"行奖项名称为空");
+					}
 					AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration();
 					QueryWrapper<AnnualCompetitionProjectRegistration> queryWrappera = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, request.getParameterMap());
 					queryWrappera.eq("annual_compid",list.get(i).getAnnualCompP());

jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionModal.vue

@@ -23,6 +23,7 @@
     visible.value = true;
     nextTick(() => {
       registerForm.value.add();
+      registerForm.value.setIsT(false);
     });
   }