资料管理根据项目负责人进行权限控制

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/domain/FilesAchievement.java

@@ -33,6 +33,9 @@ public class FilesAchievement extends BaseEntity
     @Excel(name = "项目名称")
     private String projectName;
 
+    /** 项目负责人 */
+    private String projectLeader;
+
     /** 数据年份 */
     @Excel(name = "数据年份")
     private String dataYear;
@@ -143,6 +146,15 @@ public class FilesAchievement extends BaseEntity
     {
         return projectName;
     }
+    public void setProjectLeader(String projectLeader)
+    {
+        this.projectLeader = projectLeader;
+    }
+
+    public String getProjectLeader()
+    {
+        return projectLeader;
+    }
     public void setAchiName(String achiName) 
     {
         this.achiName = achiName;

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

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectId"    column="project_id"    />
         <result property="projectNumber"    column="project_number"    />
         <result property="projectName"    column="project_name"    />
+        <result property="projectLeader"    column="project_leader"    />
         <result property="achiName"    column="achi_name"    />
         <result property="dataYear"    column="data_year"    />
         <result property="scaleGrade"    column="scale_grade"    />
@@ -35,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <sql id="Base_Column_List" >
-        a.id, a.project_id, p.project_number, p.project_name, a.achi_name, a.data_year, a.scale_grade, a.result_type, a.file_type, a.kml_url, a.kml_lng, a.kml_lat, a.work_load, a.unit, a.data_source, a.data_type, a.storage_id, s.storage_address, a.remark, a.submit_date, a.production_time, a.resolution, a.geodetic_datum
+        a.id, a.project_id, p.project_number, p.project_name, p.project_leader, a.achi_name, a.data_year, a.scale_grade, a.result_type, a.file_type, a.kml_url, a.kml_lng, a.kml_lat, a.work_load, a.unit, a.data_source, a.data_type, a.storage_id, s.storage_address, a.remark, a.submit_date, a.production_time, a.resolution, a.geodetic_datum
     </sql>
 
     <sql id="selectFilesAchievementAllVo">
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null  and projectId != ''"> and a.project_id = #{projectId}</if>
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
             <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="projectLeader != null  and projectLeader != ''"> and p.project_leader like concat('%', #{projectLeader}, '%')</if>
             <if test="achiName != null  and achiName != ''"> and a.achi_name like concat('%', #{achiName}, '%')</if>
             <if test="dataYear != null  and dataYear != ''"> and a.data_year like concat('%', #{dataYear}, '%')</if>
             <if test="scaleGrade != null  and scaleGrade != ''"> and a.scale_grade like concat('%', #{scaleGrade}, '%')</if>

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

@@ -85,8 +85,8 @@
       </el-table-column>
     </el-table>
 
-    <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" /> -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc车辆信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>