diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java index 92023f49..03aa9923 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java +++ b/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 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 page = new Page(pageNo, pageSize); IPage pageList = personalAbilityEvaluationCollectService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java index 8c34e5ff..5b142d59 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java +++ b/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 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 page = new Page(pageNo, pageSize); IPage pageList = personalCompTotalScoreService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java index 06967da0..7bcc2424 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java +++ b/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 list = ExcelImportUtil.importExcel(file.getInputStream(), AwardPersion.class, params); List 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 queryWrappera = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, request.getParameterMap()); queryWrappera.eq("annual_compid",list.get(i).getAnnualCompP()); diff --git a/jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionModal.vue b/jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionModal.vue index 9f07f102..7380cc03 100644 --- a/jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionModal.vue +++ b/jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionModal.vue @@ -23,6 +23,7 @@ visible.value = true; nextTick(() => { registerForm.value.add(); + registerForm.value.setIsT(false); }); }