用户同步处理

pms-base/src/main/java/com/tofly/base/controller/organization/TkOrganizationController.java

@@ -96,6 +96,7 @@ public class TkOrganizationController  extends BaseController {
   public List<String> getChildrenId(@RequestParam String id) {
     return organizationService.getChildrenId(id);
   }
+  @ApiOperation("数据同步")
   @GetMapping("/syncData2")
   public ResponseEntity<Boolean> syncData() {
     // ------安全测评加入------

pms-base/src/main/java/com/tofly/base/controller/role/TkRoleController.java

@@ -7,6 +7,7 @@ import com.tofly.base.server.common.data.dto.RoleDTO;
 import com.tofly.base.server.common.data.dto.request.RoleReqDTO;
 import com.tofly.base.server.common.data.enums.OrderTypeEnum;
 import com.tofly.base.server.common.data.enums.RoleEnum;
+import com.tofly.base.server.common.data.security.SecurityUser;
 import com.tofly.base.server.common.data.utils.tools.ResponseResult;
 import com.tofly.base.server.common.data.utils.tools.TkPageData;
 import com.tofly.base.service.role.RoleMenuColumnService;
@@ -15,6 +16,8 @@ import com.tofly.base.service.role.RoleService;
 import com.tofly.base.utils.DataConfig;
 import com.tofly.base.utils.NetworkCrypt;
 import com.tofly.base.utils.UserTicketUtil;
+import com.tofly.base.utils.UserTokenUtil;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import lombok.RequiredArgsConstructor;
@@ -94,9 +97,11 @@ public class TkRoleController extends BaseController {
     }
 
     @GetMapping("/me/permissions")
+    @ApiOperation("权限测试")
     public Set<String> getPermissions() {
+        final SecurityUser currentUser = UserTicketUtil.getCurrentUser();
         return roleService.getPermissions(
-                true, false, null, null);
+                currentUser.isSystemAdmin(), currentUser.isTenantAdmin(), null, null);
     }
 
     @PutMapping("update_status/{roleId}/{status}")

pms-base/src/main/java/com/tofly/base/ding/handle/DingUserHandle.java

@@ -82,6 +82,7 @@ public class DingUserHandle {
 
             sysUserEntity.setUsername(convertToPinyin(dingUserVo.getName()));
             sysUserEntity.setDingId(dingUserVo.getUserid());
+            sysUserEntity.setTenantId("13814000-1dd2-11b2-8080-808080808080");
             sysUserEntity.setStatus("1");
         }
 

pms-base/src/main/resources/bootstrap.yml

@@ -1,3 +1,3 @@
 spring:
    profiles:
-      active: dev
+      active: pro