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

# Conflicts:
#	fhKeeper/formulahousekeeper/inva_4_tivo/index.html
添加权限控制

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -2,10 +2,7 @@ package com.management.platform.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.management.platform.entity.Project;
-import com.management.platform.entity.Report;
-import com.management.platform.entity.TimeCalculation;
-import com.management.platform.entity.TimeCalculationShow;
+import com.management.platform.entity.*;
 import com.management.platform.mapper.*;
 import com.management.platform.service.ReportService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -62,8 +59,20 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             //首先根据日期获取当天所有提交过日志的人
-            List<Map<String, Object>> nameList = reportMapper.getReportNameByDate(date,
-                    userMapper.selectById(request.getHeader("Token")).getCompanyId());
+            String userId = request.getHeader("Token");
+            User user = userMapper.selectById(userId);
+            List<Map<String, Object>> nameList = new ArrayList<>();
+            if (user.getRole().equals("0")) {
+                //普通员工只能看自己的
+                Map map = new HashMap();
+                map.put("id", user.getId());
+                map.put("name", user.getName());
+                nameList.add(map);
+            } else {
+                nameList = reportMapper.getReportNameByDate(date,
+                        userMapper.selectById(request.getHeader("Token")).getCompanyId());
+            }
+
             for (Map<String, Object> map : nameList) {
                 //再根据人分别获取当天的报告
                 List<Map<String, Object>> list = reportMapper.getReportByDate(date, (String) map.get("id"));