diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/PersonalCompScoreServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/PersonalCompScoreServiceImpl.java index d98e7fae..3e23cbd6 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/PersonalCompScoreServiceImpl.java +++ b/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() - .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().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().eq(SysDepart::getOrgCode,sysUser.getOrgCode())); + bean.setDepet(sysDepart.getId()); bean.setScore(score.get()); saveList.add(bean); } diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue index 16e1676f..c7a1a974 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue +++ b/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); } /**