修改标签上传接口

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

 package com.keymobile.tagmanager.api;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
@@ -12,6 +15,8 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.keymobile.auth.common.security.GrantedAuthHelper;
+import com.keymobile.tagmanager.model.ExtTag;
+import com.keymobile.tagmanager.model.ImportLog;
 import com.keymobile.tagmanager.model.Page;
 import com.keymobile.tagmanager.service.TagFileService;
 import com.keymobile.tagmanager.util.UserInfoUtils;
@@ -47,9 +52,14 @@ public class TagFileCtrl {
 			@RequestParam(required = false , value = "deptIdPath") String deptIdPath,
 			@RequestParam("pageNo") Integer pageNo,
    			@RequestParam("pageSize") Integer pageSize) {
-		if (StringUtils.isBlank(deptIdPath)) {
-			deptIdPath = UserInfoUtils.getUserCompanyIdPath();
+		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));
 	}
 	

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

@@ -43,6 +43,9 @@ public class TagFileService {
 	@Autowired
 	private TagRepository tagRepository;
 	
+	@Autowired
+	private TagService tagService;
+	
 	public int exportExcel(String dept, HttpServletResponse response) {
 		List<Tag> toExportTags = mongoOperations.find(Query.query(Criteria.where("dept").is(dept)
 				.and("dimensionType").is(Constants.TAG_DIMENSION_TRUE)), Tag.class);
@@ -203,6 +206,10 @@ public class TagFileService {
 					t.setDimensionType(Constants.TAG_DIMENSION_TRUE);
 					t.setCreateDate(DateUtils.formatDate(new Date(), "yyyy-MM-dd"));
 					t.setImportId(importLog.getId());
+					//根据dept获取公司机构id
+					String proDept = tagService.getCompanyOrgIdByUserOrgId(dept);
+					t.setProDept(proDept);
+					
 					t = tagRepository.save(t);
 					successIds.add(t.getId());
 				}