🎨 修复根据code获取人员

master
zhangjl 2 years ago
parent 32702c5a46
commit 55c364906c
  1. 7
      .fastRequest/collections/Root/biz-module-system-api/AdminUserApi/directory.json
  2. 37
      .fastRequest/collections/Root/biz-module-system-api/AdminUserApi/getByUserCode.rapi
  3. 7
      .fastRequest/collections/Root/biz-module-system-api/directory.json
  4. 11
      .fastRequest/config/fastRequestCurrentProjectConfig.json
  5. 4
      biz-module-system-api/src/main/java/cn/ey/biz/module/system/api/permission/PermissionApi.java
  6. 5
      biz-module-system-srv/src/main/java/cn/ey/biz/module/system/api/permission/PermissionApiImpl.java
  7. 8
      biz-module-system-srv/src/main/java/cn/ey/biz/module/system/service/permission/PermissionService.java
  8. 12
      biz-module-system-srv/src/main/java/cn/ey/biz/module/system/service/permission/PermissionServiceImpl.java
  9. 2
      pom.xml

@ -0,0 +1,7 @@
{
"description":"",
"directory":"/.fastRequest/collections/ROOT/biz-module-system-api/AdminUserApi",
"filePath":"/.fastRequest/collections/ROOT/biz-module-system-api/AdminUserApi/",
"name":"AdminUserApi",
"type":3
}

@ -0,0 +1,37 @@
{
"activeGroup":"Default",
"apiParamGroup":{},
"childList":[],
"description":"",
"directory":"/.fastRequest/collections/ROOT/biz-module-system-api/AdminUserApi",
"domain":"http://localhost:8080",
"enableEnv":"local",
"enableProject":"biz-module-system-api",
"filePath":"/.fastRequest/collections/ROOT/biz-module-system-api/AdminUserApi~getByUserCode.rapi",
"headerList":[],
"id":"api_cn.ey.biz.module.system.api.user.AdminUserApi.getByUserCode",
"name":"通过用户用户编号 查询用户",
"paramGroup":{
"bodyKeyValueListJson":"",
"className":"cn.ey.biz.module.system.api.user.AdminUserApi",
"jsonDocument":"",
"method":"getByUserCode",
"methodDescription":"通过用户用户编号 查询用户",
"methodType":"GET",
"multipartKeyValueListJson":"[]",
"originUrl":"/rpc-api/system/user/get-by-user-code",
"pathParamsKeyValueListJson":"[]",
"postScript":"",
"postType":"json",
"preScript":"",
"returnDocument":"{\"code\":\"No comment,Type =Number\",\"data\":{\"id\":\"用户ID\",\"userCode\":\"用户编码\",\"gpn\":\"用户编码-GPN\",\"displayName\":\"名字全称\",\"buesinessUnit\":\"buesinessUnit\",\"mgmtUnit\":\"mgmtUnit\",\"operatingUnit\":\"operatingUnit\",\"subMgmtUnit\":\"subMgmtUnit\",\"rankCode\":\"等级\",\"baseLocation\":\" base 地\",\"region\":\"区域\",\"country\":\"国家\",\"serviceLine\":\"serviceLine\",\"subServiceLine\":\"subServiceLine\",\"legalEntity\":\"所属公司主体\"},\"msg\":\"No comment,Type =String\",\"success\":\"No comment,Type =Boolean\"}",
"tempId":"",
"url":"/rpc-api/system/user/get-by-user-code",
"urlEncodedKeyValueListJson":"[]",
"urlEncodedKeyValueListText":"",
"urlParamsKeyValueListJson":"[{\"comment\":\"用户编号\",\"customFlag\":2,\"enabled\":true,\"key\":\"userCode\",\"type\":\"String\",\"value\":\"1\"}]",
"urlParamsKeyValueListText":"userCode=1"
},
"tempId":"api_cn.ey.biz.module.system.api.user.AdminUserApi.getByUserCode",
"type":2
}

@ -0,0 +1,7 @@
{
"description":"",
"directory":"/.fastRequest/collections/ROOT\\biz-module-system-api",
"filePath":"/.fastRequest/collections/ROOT\\biz-module-system-api/",
"name":"biz-module-system-api",
"type":4
}

@ -5,13 +5,9 @@
{
"env":"local",
"url":"http://localhost:48081/admin-api"
},
{
"env":"g",
"url":"http://localhost:48080/admin-api"
}
],
"name":"biz-module-system-srv"
"name":"system"
},
{
"hostGroup":[
@ -24,15 +20,14 @@
}
],
"envList":[
"local",
"g"
"local"
],
"headerList":[],
"maxDescriptionLength":-1,
"postScript":"",
"preScript":"",
"projectList":[
"biz-module-system-srv",
"system",
"biz-module-system-api"
],
"syncModel":{

@ -85,4 +85,8 @@ public interface PermissionApi {
@ApiImplicitParam(name = "code", value = "角色code", example = "2", required = true, dataTypeClass = String.class)
R<List<AdminUserRespDTO>> getUsersByRoleCode(@RequestParam("code") String code);
@GetMapping(PREFIX + "/is-user-admin")
@ApiOperation("判断是否有权限,任一一个即可")
R<Boolean> isUserAdmin(@RequestParam("userId") Long userId);
}

@ -91,4 +91,9 @@ public class PermissionApiImpl implements PermissionApi {
return success(permissionService.getUsersByRoleCode(code));
}
@Override
public R<Boolean> isUserAdmin(Long userId) {
return success(permissionService.isUserAdmin(userId));
}
}

@ -184,4 +184,12 @@ public interface PermissionService {
* @return 用户信息集合
*/
List<AdminUserRespDTO> getUsersByRoleCodes(List<String> roleCodes);
/**
* 是否是管理员
*
* @param userId 用户id
* @return
*/
Boolean isUserAdmin(Long userId);
}

@ -842,6 +842,18 @@ public class PermissionServiceImpl implements PermissionService {
return new ArrayList<>();
}
/**
* 是否是管理员
*
* @param userId 用户id
* @return
*/
@Override
public Boolean isUserAdmin(Long userId) {
Set<Long> cacheRoleIds = userRoleCache.get(userId);
return roleService.hasAnySuperAdmin(cacheRoleIds);
}
public List<CodeBlockListDataRespDTO> getCodeBlockListDataRespDTO(Set<String> ids){
List<CodeBlockDO> codeBlockDOList=codeBlockMapper.selectList(new LambdaQueryWrapper<CodeBlockDO>()
.in(CodeBlockDO::getCodeBlockCode,ids));

@ -25,7 +25,7 @@
</description>
<properties>
<revision>1.0.0</revision>
<revision>1.0.44</revision>
</properties>
<repositories>
<repository>

Loading…
Cancel
Save