Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/customerBuler-crm/src/App.vue

@@ -72,7 +72,7 @@ body,
 .layouts {
   width: 100%;
   height: 100%;
-  /* overflow: hidden; */
+  overflow: hidden;
   min-width: 800px;
 }
 * {

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -1690,24 +1690,18 @@
     </select>
 
     <select id="selectNearProject" resultType="com.management.platform.entity.Project">
-        select * from project
-        where status = 1 and id in (
+        SELECT * FROM project
+        WHERE STATUS = 1 AND id IN (
             SELECT project_id
-            from (
-                     SELECT project_id
-                     FROM (
-                              SELECT DISTINCT *
-                              FROM report
-                              WHERE creator_id = #{userId}
-                              order by create_time
-                                      DESC
-                          ) p1
+            FROM (
+                     SELECT DISTINCT report.project_id
+                     FROM report
+                     WHERE creator_id = #{userId}
                      GROUP BY project_id
-                     order by create_time
-                             DESC
-                         LIMIT 3
+                     ORDER BY MAX(create_time)
+                             DESC LIMIT 3
                  ) p2
-        )
+        ) AND id IN(SELECT project_id FROM participation WHERE user_id=#{userId})
     </select>
 
     <select id="getFTEData" resultType="java.util.Map">

fhKeeper/formulahousekeeper/timesheet/src/views/financeAudit/financeAudit.vue

@@ -94,7 +94,8 @@ export default {
                 path: '/cost',
                 query: {
                     startDate: item.reportYrmnth,
-                    endDate: item.reportYrmnth
+                    endDate: item.reportYrmnth,
+                    financeAudit: 1
                 }
             })
         },

fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -1469,7 +1469,8 @@
                 }
                 this.exportParam.dateRange = this.dateRange;
             }
-            if(this.$route.query && this.$route.query.endDate && this.$route.query.startDate) {
+            console.log(this.$route, '<==== 当前的数据')
+            if(this.$route.query && this.$route.query.endDate && this.$route.query.startDate && this.$route.query.financeAudit) {
                 const { endDate, startDate } = this.$route.query
                 const lastDay = this.dayjs(`${endDate}-01`).endOf('month').format('YYYY-MM-DD');
                 this.dateRange = [startDate+'-01', lastDay];