修改项目负责人查看工作填报

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeclareMapper.xml

@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCmcDeclareVo"/>
         <where>  
             <if test="projectId != null  and projectId != ''"> and d.project_id = #{projectId}</if>
-            <if test="projectLeader != null"> and d.project_leader = #{projectLeader}</if>
+            <if test="projectLeader != null"> and p.project_leader = #{projectLeader}</if>
             <if test="userId != null"> and d.user_id = #{userId}</if>
             <if test="deptId != null"> and u.dept_id = #{deptId}</if>
             <if test="workType != null  and workType != ''"> and d.work_type = #{workType}</if>

oa-ui/src/views/oa/declare/index.vue

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-08-14 14:24:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-21 17:31:27
+ * @LastEditTime: 2025-01-03 09:28:39
 -->
 <template>
   <div class="app-container">
@@ -240,6 +240,12 @@ export default {
       if (this.$store.getters.deptId > 103) {
         this.queryParams.deptId = this.$store.getters.deptId;
       }
+      if (this.$store.getters.roles.includes('projectLeader')) {
+        this.queryParams.projectLeader = this.$store.getters.userId
+      }
+      if (this.$store.getters.roles.includes('dept')) {
+        this.queryParams.projectLeader = null
+      }
       listDeclare(this.queryParams).then(response => {
         this.declareList = response.rows;
         this.total = response.total;