个人能力汇总部门不显示问题 修改 7.31

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());

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",