修改根据当前登录用户获取导入日志接口

src/main/java/com/keymobile/tagmanager/api/TagFileCtrl.java

@@ -31,6 +31,7 @@ public class TagFileCtrl {
 	@Autowired
 	private TagFileService tagExportService;
 	
+	@ApiOperation(value = "导出标签元数据excel文件", notes = "导出标签元数据excel文件")
 	@GetMapping("/exportTagMeta")
 	public int exportTagMeta(@RequestParam("idPath") String idPath,
 				@RequestParam("dimensionType") String dimensionType,
@@ -59,15 +60,16 @@ public class TagFileCtrl {
 			@RequestParam(required = false , value = "deptIdPath") String deptIdPath,
 			@RequestParam("pageNo") Integer pageNo,
    			@RequestParam("pageSize") Integer pageSize) {
-		Long deptId = GrantedAuthHelper.getUserOrg();
-		if(deptId==null) {
-			Page page = new Page(pageSize, pageNo);
-			page.setData(new ArrayList<ImportLog>());
-			page.setTotal(0L);
-			return page;
-		}
-		deptIdPath = /**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
-		return tagExportService.listImportlogByPage(deptIdPath, new Page(pageSize, pageNo));
+//		Long deptId = GrantedAuthHelper.getUserOrg();
+//		if(deptId==null) {
+//			Page page = new Page(pageSize, pageNo);
+//			page.setData(new ArrayList<ImportLog>());
+//			page.setTotal(0L);
+//			return page;
+//		}
+		String userName = UserInfoUtils.getUserName();
+//		deptIdPath = /**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
+		return tagExportService.listImportlogByPage(userName, new Page(pageSize, pageNo));
 	}
 	
 	@ApiOperation(value = "撤销导入", notes = "撤销导入")

src/main/java/com/keymobile/tagmanager/service/TagFileService.java

@@ -317,8 +317,8 @@ public class TagFileService {
 		}
 	}
 
-	public Page listImportlogByPage(String dept, Page page) {
-		Query q = createImportlogPageQuery(dept, page);
+	public Page listImportlogByPage(String userName, Page page) {
+		Query q = createImportlogPageQuery(userName, page);
 		List<ImportLog> logs = mongoOperations
 				.find(q, ImportLog.class);
 		long count = mongoOperations.count(q, ImportLog.class);
@@ -327,10 +327,10 @@ public class TagFileService {
 		return page;
 	}
 	
-	private Query createImportlogPageQuery(String dept, Page page) {
+	private Query createImportlogPageQuery(String userName, Page page) {
 		Query q = new Query();
 		q.addCriteria(Criteria.where("type").is(Constants.COMMON_TAG_LOG_TYPE));
-		q.addCriteria(Criteria.where("dept").is(dept));
+		q.addCriteria(Criteria.where("creator").is(userName));
 		q.skip(page.getOffset());
 	    q.limit(page.getPageSize());
 	    q.with(Sort.by(Arrays.asList(new Order(Direction.DESC, "startTime"))));