修改获取当前登录用户机构接口

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

@@ -73,7 +73,7 @@ public class TagCtrl {
 			@RequestParam(value = "parentId", required = false) String parentId,
 			@RequestParam(required = false) String deptIdPath) throws TagNotExistException   {
 		//获取当前登录用户机构
-		deptIdPath = UserInfoUtils.getDataRoleOrg();
+		deptIdPath = /**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
 		
 		//考虑一个用户对应多个机构的情况
 		List<String> orgIds = new ArrayList<>();
@@ -87,7 +87,7 @@ public class TagCtrl {
 			@RequestParam(value = "parentId", required = false) String parentId,
 			@RequestParam(required = false) String deptIdPath) throws TagNotExistException {
 		//获取当前登录用户机构id
-		deptIdPath = UserInfoUtils.getDataRoleOrg();
+		deptIdPath = /**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
 		//考虑一个用户对应多个机构的情况
 		List<String> orgIds = new ArrayList<>();
 		orgIds.add(deptIdPath);
@@ -106,7 +106,7 @@ public class TagCtrl {
    			@RequestParam("pageNo") Integer pageNo,
    			@RequestParam("pageSize") Integer pageSize) throws TagNotExistException{
 		String userName = UserInfoUtils.getUserId();
-		deptIdPath = UserInfoUtils.getDataRoleOrg();
+		deptIdPath = /**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
 		//考虑一个用户对应多个机构的情况
 		List<String> orgIds = new ArrayList<>();
 		orgIds.add(deptIdPath);
@@ -123,7 +123,7 @@ public class TagCtrl {
    			@RequestParam("pageNo") Integer pageNo,
    			@RequestParam("pageSize") Integer pageSize) throws TagNotExistException{
 		String userName = UserInfoUtils.getUserId();
-		deptIdPath = UserInfoUtils.getDataRoleOrg();
+		deptIdPath =/**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
 		//考虑一个用户对应多个机构的情况
 		List<String> orgIds = new ArrayList<>();
 		orgIds.add(deptIdPath);
@@ -155,7 +155,7 @@ public class TagCtrl {
 			@RequestParam(value = "parentId", required = false) String parentId,
 			@RequestParam(required = false) String deptIdPath) throws TagNotExistException  {
 		String userName = UserInfoUtils.getUserId();
-		deptIdPath = UserInfoUtils.getDataRoleOrg();
+		deptIdPath = /**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
 		//考虑一个用户对应多个机构的情况
 		List<String> orgIds = new ArrayList<>();
 		orgIds.add(deptIdPath);

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 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.Page;
 import com.keymobile.tagmanager.service.TagFileService;
 import com.keymobile.tagmanager.util.UserInfoUtils;
@@ -27,7 +28,7 @@ public class TagFileCtrl {
 	
 	@GetMapping("/exportTag")
 	public int export(HttpServletResponse response, @RequestParam(required = false , value = "deptIdPath") String deptIdPath) {
-		deptIdPath = UserInfoUtils.getDataRoleOrg();
+		deptIdPath = /**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
 		return tagExportService.exportExcel(deptIdPath, response);
 	}
 	
@@ -36,7 +37,7 @@ public class TagFileCtrl {
 			@RequestParam(required = false , value = "deptIdPath") String deptIdPath) throws Exception {
 		String userName = UserInfoUtils.getUserName();
 		String userId = UserInfoUtils.getUserId();
-		deptIdPath = UserInfoUtils.getDataRoleOrg();
+		deptIdPath = /**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
 		return tagExportService.importExcel(userName, userId, deptIdPath, file);
 	}