From 3ed5f25c1b66c73d568a775105743f4415cac8e0 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Wed, 31 Jul 2024 09:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=83=BD=E5=8A=9B=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E9=83=A8=E9=97=A8=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E4=BF=AE=E6=94=B9=207.31?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PersonalAbilityEvaluationCollectServiceImpl.java     | 9 ++++++++-
 .../PersonalAbilityEvaluationCollect.data.ts             | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/service/impl/PersonalAbilityEvaluationCollectServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/service/impl/PersonalAbilityEvaluationCollectServiceImpl.java
index 011b203c..f94b3c01 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/service/impl/PersonalAbilityEvaluationCollectServiceImpl.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/service/impl/PersonalAbilityEvaluationCollectServiceImpl.java
@@ -7,7 +7,9 @@ import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluation
 import org.jeecg.modules.demo.abilityEvaluation.mapper.PersonalAbilityEvaluationCollectMapper;
 import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationCollectService;
 import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationService;
+import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,6 +37,9 @@ public class PersonalAbilityEvaluationCollectServiceImpl extends ServiceImpl<Per
     @Autowired
     private ISysUserService iSysUserService;
 
+    @Autowired
+    private ISysDepartService iSysDepartService;
+
     /**
      * @Title: batchSave
      * @Description:
@@ -81,7 +86,9 @@ public class PersonalAbilityEvaluationCollectServiceImpl extends ServiceImpl<Per
                 List<PersonalAbilityEvaluation> list = capacityListMap.get(k);
                 PersonalAbilityEvaluationCollect person = new PersonalAbilityEvaluationCollect();
                 person.setAnnualCompP(projectId);
-                person.setDepetId(sysUser.getDepartIds());
+                SysDepart sysDepart = iSysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getOrgCode,sysUser.getOrgCode()));
+//                bean.setDepet(sysDepart.getId());
+                person.setDepetId(sysDepart.getId());
                 person.setWorkOn(workNo);
                 person.setName(sysUser.getRealname());
                 person.setCapacityId(list.get(0).getCapacityId());
diff --git a/jeecgboot-vue3-master/src/views/abilityEvaluation/persanlCollect/PersonalAbilityEvaluationCollect.data.ts b/jeecgboot-vue3-master/src/views/abilityEvaluation/persanlCollect/PersonalAbilityEvaluationCollect.data.ts
index e069daf3..6d0e7a5e 100644
--- a/jeecgboot-vue3-master/src/views/abilityEvaluation/persanlCollect/PersonalAbilityEvaluationCollect.data.ts
+++ b/jeecgboot-vue3-master/src/views/abilityEvaluation/persanlCollect/PersonalAbilityEvaluationCollect.data.ts
@@ -1,11 +1,11 @@
 import {BasicColumn, FormSchema} from '/@/components/Table';
 //列表数据
 export const columns: BasicColumn[] = [
-/*  {
+  {
     title: '所属部门',
     align: "center",
     dataIndex: 'depetId_dictText'
-  },*/
+  },
   {
     title: '学号',
     align: "center",