个人积分汇总部门不显示问题 修改 7.31

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/PersonalCompScoreServiceImpl.java

@@ -73,6 +73,9 @@ public class PersonalCompScoreServiceImpl extends ServiceImpl<PersonalCompScoreM
     @Autowired
     private IAwardPersionService iAwardPersionService;
 
+    @Autowired
+    private ISysDepartService iSysDepartService;
+
     private static final Integer ONE_HUNDRED = 100;
     private static final Double ZERO_POINT_FIVE = 0.5;
     private static final Double ZERO_POINT_TWO = 0.2;
@@ -98,7 +101,8 @@ public class PersonalCompScoreServiceImpl extends ServiceImpl<PersonalCompScoreM
 
         //年度比赛项目，只有isPj为1时才能触发个人比赛积分汇总
         AnnualCompPoint annualCompPoint = iAnnualCompPointService.getOne(new LambdaQueryWrapper<AnnualCompPoint>()
-                .eq(AnnualCompPoint::getAnnualCompId, annualCompId)
+//                .eq(AnnualCompPoint::getAnnualCompId, annualCompId)
+                .eq(AnnualCompPoint::getId, personalCompScore.getAnnualCompP())
                 .eq(AnnualCompPoint::getIsPj, new Integer(1))
         );
 
@@ -176,8 +180,8 @@ public class PersonalCompScoreServiceImpl extends ServiceImpl<PersonalCompScoreM
                         SysUser sysUser = iSysUserService.getById(e.getUserId());
                         bean.setWorkOn(sysUser.getWorkNo());
                         bean.setName(sysUser.getRealname());
-//                        SysDepart sysDepart = iSysDepartService.getDepartByOrgCode(sysUser.getOrgCode());
-                        bean.setDepet(sysUser.getDepartIds());
+                        SysDepart sysDepart = iSysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getOrgCode,sysUser.getOrgCode()));
+                        bean.setDepet(sysDepart.getId());
                         bean.setScore(score.get());
                         saveList.add(bean);
                     });
@@ -191,8 +195,8 @@ public class PersonalCompScoreServiceImpl extends ServiceImpl<PersonalCompScoreM
                     SysUser sysUser = iSysUserService.getById(teamManagement.getUserId());
                     bean.setWorkOn(sysUser.getWorkNo());
                     bean.setName(sysUser.getRealname());
-//                    SysDepart sysDepart = iSysDepartService.getDepartByOrgCode(sysUser.getOrgCode());
-                    bean.setDepet(sysUser.getDepartIds());
+                    SysDepart sysDepart = iSysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getOrgCode,sysUser.getOrgCode()));
+                    bean.setDepet(sysDepart.getId());
                     bean.setScore(score.get());
                     saveList.add(bean);
                 }

jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue

@@ -255,7 +255,7 @@
    * 个人积分汇总
    */
   function handleCollectScoreApply(record: Recordable) {
-    collectScore({id: record.id, annualCompId: record.annualCompId}, handleSuccess);
+    collectScore({id: record.id, annualCompId: record.annualCompId, annualCompP: record.id}, handleSuccess);
   }
 
   /**