Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-auth
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-platform-auth
Commits
01185519
Commit
01185519
authored
Feb 04, 2021
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
联合商户列表接口
parent
784ca283
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
55 additions
and
10 deletions
+55
-10
ResourceGroupDTO.java
...-api/src/main/java/com/gic/auth/dto/ResourceGroupDTO.java
+2
-2
UserApiService.java
...pi/src/main/java/com/gic/auth/service/UserApiService.java
+7
-0
TabSysUserMapper.java
...c/main/java/com/gic/auth/dao/mapper/TabSysUserMapper.java
+7
-0
UserService.java
...rvice/src/main/java/com/gic/auth/service/UserService.java
+7
-0
UserServiceImpl.java
.../main/java/com/gic/auth/service/impl/UserServiceImpl.java
+5
-0
MenuApiServiceImpl.java
...a/com/gic/auth/service/outer/impl/MenuApiServiceImpl.java
+4
-3
ResourceGroupApiServiceImpl.java
.../auth/service/outer/impl/ResourceGroupApiServiceImpl.java
+1
-5
UserApiServiceImpl.java
...a/com/gic/auth/service/outer/impl/UserApiServiceImpl.java
+9
-0
TabSysUserMapper.xml
...th-service/src/main/resources/mapper/TabSysUserMapper.xml
+13
-0
No files found.
gic-platform-auth-api/src/main/java/com/gic/auth/dto/ResourceGroupDTO.java
View file @
01185519
...
...
@@ -35,12 +35,12 @@ public class ResourceGroupDTO implements Serializable{
private
Integer
customUser
;
/**
* 用户域配置,json格式 [{"type":1,"sort":1,"areaValue":"","cuSelectId":""}]
* 用户域配置,json格式 [{"type":1,"sort":1,"areaValue":"","cuSelectId":""}]
(前端传递参数)
*/
private
String
customUserData
;
/**
*
用户域配置json转为类
*
customUserData用户域配置json转为类(后端业务使用)
*/
private
List
<
ResourceGroupCustomUserDTO
>
customUserList
;
...
...
gic-platform-auth-api/src/main/java/com/gic/auth/service/UserApiService.java
View file @
01185519
...
...
@@ -140,6 +140,13 @@ public interface UserApiService {
ServiceResponse
<
UserDTO
>
getUserByEnterpriseId
(
Integer
enterpriseId
);
/**
* 查询超管信息
* @param enterpriseIdList
* @return
*/
ServiceResponse
<
List
<
UserDTO
>>
listUserByEnterpriseId
(
List
<
Integer
>
enterpriseIdList
);
/**
* 根据登录账号查询商户列
* @Title: listUserByPhoneNumber
* @Description:
...
...
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysUserMapper.java
View file @
01185519
...
...
@@ -92,6 +92,13 @@ public interface TabSysUserMapper {
TabSysUser
selectByEnterpriseId
(
@Param
(
"enterpriseId"
)
Integer
enterpriseId
);
/**
* 查询超管数据
* @param enterpriseIdList
* @return
*/
List
<
TabSysUser
>
listUserByEnterpriseId
(
@Param
(
"list"
)
List
<
Integer
>
enterpriseIdList
);
/**
* listUserByPhoneNumberAndEnterprise
* @Title: listUserByPhoneNumberAndEnterprise
* @Description:
...
...
gic-platform-auth-service/src/main/java/com/gic/auth/service/UserService.java
View file @
01185519
...
...
@@ -100,6 +100,13 @@ public interface UserService {
TabSysUser
getUserByEnterpriseId
(
Integer
enterpriseId
);
/**
* 查询超管信息
* @param enterpriseIdList
* @return
*/
List
<
TabSysUser
>
listUserByEnterpriseId
(
List
<
Integer
>
enterpriseIdList
);
/**
* listAllUserByPhoneNumber
* @Title: listAllUserByPhoneNumber
* @Description:
...
...
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/UserServiceImpl.java
View file @
01185519
...
...
@@ -112,6 +112,11 @@ public class UserServiceImpl implements UserService {
}
@Override
public
List
<
TabSysUser
>
listUserByEnterpriseId
(
List
<
Integer
>
enterpriseIdList
)
{
return
tabSysUserMapper
.
listUserByEnterpriseId
(
enterpriseIdList
);
}
@Override
public
List
<
TabSysUser
>
listAllUserByPhoneNumber
(
String
phoneNumber
,
String
nationCode
)
{
return
tabSysUserMapper
.
listUserByPhoneNumberAndEnterprise
(
phoneNumber
,
nationCode
,
null
);
}
...
...
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/MenuApiServiceImpl.java
View file @
01185519
...
...
@@ -363,10 +363,11 @@ public class MenuApiServiceImpl implements MenuApiService {
if
(
tabSysUser
==
null
)
{
return
ServiceResponse
.
success
(
new
ArrayList
<>());
}
if
(
tabSysUser
.
getLoginType
().
intValue
()
!=
0
)
{
if
(
tabSysUser
.
getLoginType
()
!=
0
)
{
//达摩
tabSysMenuList
=
filterOperationUserDepartAuth
(
menuService
.
selectAppMenuByParam
(
projectList
,
versionList
,
null
),
tabSysUser
);
}
else
if
(
tabSysUser
.
getSuperAdmin
()
.
intValue
()
==
1
)
{
}
else
if
(
tabSysUser
.
getSuperAdmin
()
==
1
)
{
//超级管理员,包括1和2的权限适用
tabSysMenuList
=
menuService
.
selectAppMenuByParam
(
projectList
,
versionList
,
...
...
@@ -1489,7 +1490,7 @@ public class MenuApiServiceImpl implements MenuApiService {
if
(
CollectionUtils
.
isNotEmpty
(
resourceList
))
{
List
<
String
>
resourceCodeList
=
new
ArrayList
<>();
for
(
EnterpriseResourceRelDTO
res
:
resourceList
)
{
if
(
res
.
getResourceSwitch
()
.
intValue
()
==
0
)
{
if
(
res
.
getResourceSwitch
()
==
0
)
{
resourceCodeList
.
add
(
res
.
getResourceCode
());
}
}
...
...
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceGroupApiServiceImpl.java
View file @
01185519
...
...
@@ -116,11 +116,7 @@ public class ResourceGroupApiServiceImpl implements ResourceGroupApiService{
if
(
exist
)
{
return
ServiceResponse
.
failure
(
ErrorCode
.
OPERATION_FAILED
.
getCode
(),
"该资源组正在使用中,不能删除"
);
}
Integer
line
=
resourceGroupService
.
deleteResourceGroup
(
resourceGroupId
);
if
(
line
>
0
)
{
// 同步好办
authorizeService
.
delResource
(
resourceGroupId
.
longValue
());
}
resourceGroupService
.
deleteResourceGroup
(
resourceGroupId
);
return
ServiceResponse
.
success
(
record
.
getResourceGroupName
());
}
...
...
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/UserApiServiceImpl.java
View file @
01185519
...
...
@@ -415,6 +415,15 @@ public class UserApiServiceImpl implements UserApiService {
}
@Override
public
ServiceResponse
<
List
<
UserDTO
>>
listUserByEnterpriseId
(
List
<
Integer
>
enterpriseIdList
)
{
List
<
TabSysUser
>
list
=
userService
.
listUserByEnterpriseId
(
enterpriseIdList
);
if
(
CollectionUtils
.
isNotEmpty
(
list
))
{
return
ServiceResponse
.
success
(
EntityUtil
.
changeEntityListNew
(
UserDTO
.
class
,
list
));
}
return
ServiceResponse
.
success
(
Collections
.
emptyList
());
}
@Override
public
ServiceResponse
<
List
<
UserDTO
>>
listUserByPhoneNumber
(
String
phoneNumber
,
String
nationCode
)
{
List
<
TabSysUser
>
list
=
this
.
userService
.
listAllUserByPhoneNumber
(
phoneNumber
,
nationCode
);
if
(
CollectionUtils
.
isNotEmpty
(
list
))
{
...
...
gic-platform-auth-service/src/main/resources/mapper/TabSysUserMapper.xml
View file @
01185519
...
...
@@ -255,6 +255,19 @@
and login_type = 0
</select>
<select
id=
"listUserByEnterpriseId"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_sys_user
where enterprise_id in
<foreach
collection=
"list"
index=
"index"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
and delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@NORMAL_STATUS}
and super_admin = 1
and login_type = 0
</select>
<select
id=
"listUserByPhoneNumberAndEnterprise"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment