瀏覽代碼

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

余思翰 5 月之前
父節點
當前提交
aae862a959

+ 1
- 1
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeclareMapper.xml 查看文件

45
         <include refid="selectCmcDeclareVo"/>
45
         <include refid="selectCmcDeclareVo"/>
46
         <where>  
46
         <where>  
47
             <if test="projectId != null  and projectId != ''"> and d.project_id = #{projectId}</if>
47
             <if test="projectId != null  and projectId != ''"> and d.project_id = #{projectId}</if>
48
-            <if test="projectLeader != null"> and d.project_leader = #{projectLeader}</if>
48
+            <if test="projectLeader != null"> and p.project_leader = #{projectLeader}</if>
49
             <if test="userId != null"> and d.user_id = #{userId}</if>
49
             <if test="userId != null"> and d.user_id = #{userId}</if>
50
             <if test="deptId != null"> and u.dept_id = #{deptId}</if>
50
             <if test="deptId != null"> and u.dept_id = #{deptId}</if>
51
             <if test="workType != null  and workType != ''"> and d.work_type = #{workType}</if>
51
             <if test="workType != null  and workType != ''"> and d.work_type = #{workType}</if>

+ 7
- 1
oa-ui/src/views/oa/declare/index.vue 查看文件

2
  * @Author: wrh
2
  * @Author: wrh
3
  * @Date: 2024-08-14 14:24:11
3
  * @Date: 2024-08-14 14:24:11
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-10-21 17:31:27
5
+ * @LastEditTime: 2025-01-03 09:28:39
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="app-container">
8
   <div class="app-container">
240
       if (this.$store.getters.deptId > 103) {
240
       if (this.$store.getters.deptId > 103) {
241
         this.queryParams.deptId = this.$store.getters.deptId;
241
         this.queryParams.deptId = this.$store.getters.deptId;
242
       }
242
       }
243
+      if (this.$store.getters.roles.includes('projectLeader')) {
244
+        this.queryParams.projectLeader = this.$store.getters.userId
245
+      }
246
+      if (this.$store.getters.roles.includes('dept')) {
247
+        this.queryParams.projectLeader = null
248
+      }
243
       listDeclare(this.queryParams).then(response => {
249
       listDeclare(this.queryParams).then(response => {
244
         this.declareList = response.rows;
250
         this.declareList = response.rows;
245
         this.total = response.total;
251
         this.total = response.total;

Loading…
取消
儲存