取数平台权限

gic-cloud-data-hook-service/src/main/resources/mapper/DownloadRecordDao.xml

@@ -40,7 +40,9 @@
 			<include refid="queryTables"/>
 			<include refid="queryJoins"/>
 		WHERE
-			q.user_id = #{userId}
+			<if test="userId != null and userId !=''">
+				q.user_id = #{userId}
+			</if>
 			<if test="startTime != null">
 				AND q.download_time <![CDATA[ >= ]]> #{startTime}
 			</if>

gic-cloud-data-hook/src/main/java/com/gic/cloud/data/hook/web/DownloadTaskController.java

@@ -6,6 +6,7 @@ import com.gic.cloud.data.hook.api.dto.DownloadTask;
 import com.gic.cloud.data.hook.api.dto.RiskModeRecord;
 import com.gic.cloud.data.hook.api.entity.GeneralResult;
 import com.gic.cloud.data.hook.api.service.IDownloadTaskService;
+import com.gic.web.common.utils.SessionContextUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -89,8 +90,9 @@ public class DownloadTaskController {
 		String finEndTimeText = StringUtils.isNoneBlank(endTimeText) ? endTimeText + " 23:59:59" : "";
 		Date startTime = finStartTimeText.equals("") ? null : datetimeFormatter.parse(finStartTimeText);
 		Date endTime = finEndTimeText.equals("") ? null : datetimeFormatter.parse(finEndTimeText);
-		System.out.println(startTime);
-		System.out.println(endTime);
+		if(SessionContextUtils.getLoginUser().getSuperAdmin() == 1){
+			userId = null;
+		}
 		return this.downloadTaskService.getDownloadRecordPage(userId, enterpriseId, startTime, endTime, queryDataType, fuzzyRange, fuzzy, pageNum, pageSize);
 	}
 
@@ -112,8 +114,6 @@ public class DownloadTaskController {
 		String finEndTimeText = StringUtils.isNoneBlank(endTimeText) ? endTimeText + " 23:59:59" : "";
 		Date startTime = finStartTimeText.equals("") ? null : datetimeFormatter.parse(finStartTimeText);
 		Date endTime = finEndTimeText.equals("") ? null : datetimeFormatter.parse(finEndTimeText);
-//		Date startTime = startTimeText.equals("") ? null : datetimeFormatter.parse(startTimeText);
-//		Date endTime = endTimeText.equals("") ? null : datetimeFormatter.parse(endTimeText);
 		return this.downloadTaskService.getRiskModeRecordPage(enterpriseId, startTime, endTime, riskDuration, fuzzyRange, fuzzy, pageNum, pageSize);
 	}