Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
fangxinjiang
yifu-mvp
Commits
9bfad430
Commit
9bfad430
authored
Sep 05, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.15-税友户配置拦截权限2
parent
ee025262
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
257 additions
and
55 deletions
+257
-55
UpmsDaprUtils.java
...fu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java
+13
-1
HouseConfigConstants.java
...d/plus/v1/yifu/social/constants/HouseConfigConstants.java
+2
-1
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+163
-46
UserController.java
...u/cloud/plus/v1/yifu/admin/controller/UserController.java
+14
-5
SysUserMapper.java
...m/yifu/cloud/plus/v1/yifu/admin/mapper/SysUserMapper.java
+4
-1
SysUserService.java
...yifu/cloud/plus/v1/yifu/admin/service/SysUserService.java
+4
-0
SysUserServiceImpl.java
...d/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java
+29
-0
SysUserMapper.xml
...yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+28
-1
No files found.
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java
View file @
9bfad430
...
@@ -185,7 +185,7 @@ public class UpmsDaprUtils {
...
@@ -185,7 +185,7 @@ public class UpmsDaprUtils {
/**
/**
* @param paramVo 用户IDList + 菜单Id
* @param paramVo 用户IDList + 菜单Id
* @Description: 判断用户是否有菜单
* @Description: 判断用户
的角色
是否有菜单
* @Author: hgw
* @Author: hgw
* @Date: 2025/9/4 16:09
* @Date: 2025/9/4 16:09
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo>
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo>
...
@@ -195,4 +195,16 @@ public class UpmsDaprUtils {
...
@@ -195,4 +195,16 @@ public class UpmsDaprUtils {
,
"/user/inner/judgeDispatchAudit"
,
paramVo
,
KeyValueReturnVo
.
class
,
SecurityConstants
.
FROM_IN
);
,
"/user/inner/judgeDispatchAudit"
,
paramVo
,
KeyValueReturnVo
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
/**
* @param paramVo 用户IDList + 菜单Id
* @Description: 判断用户的权限(用户拼接用户组)是否有菜单
* @Author: hgw
* @Date: 2025/9/4 16:09
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo>
**/
public
R
<
KeyValueReturnVo
>
judgeDiyAuthMenuByUserId
(
ListAndStringVo
paramVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprUpmsProperties
.
getAppUrl
(),
daprUpmsProperties
.
getAppId
()
,
"/user/inner/judgeDiyAuthMenuByUserId"
,
paramVo
,
KeyValueReturnVo
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/HouseConfigConstants.java
View file @
9bfad430
...
@@ -23,7 +23,8 @@ public class HouseConfigConstants {
...
@@ -23,7 +23,8 @@ public class HouseConfigConstants {
public
static
final
String
ERROR_TEMPLATE_THREE
=
"是否自动办理只能为【是】或者【否】"
;
public
static
final
String
ERROR_TEMPLATE_THREE
=
"是否自动办理只能为【是】或者【否】"
;
public
static
final
String
ERROR_TEMPLATE_FOUR
=
"未找到对应的审核人或办理人的人员信息"
;
public
static
final
String
ERROR_TEMPLATE_AUDIT_USER
=
"未找到对应的审核人信息"
;
public
static
final
String
ERROR_TEMPLATE_HANDLE_USER
=
"未找到对应的办理人信息"
;
public
static
final
String
ERROR_TEMPLATE_FIVE
=
"社保账户,社保密码和医保账户,医保密码的账号和密码必须都填写或者都不填写"
;
public
static
final
String
ERROR_TEMPLATE_FIVE
=
"社保账户,社保密码和医保账户,医保密码的账号和密码必须都填写或者都不填写"
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
9bfad430
This diff is collapsed.
Click to expand it.
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/UserController.java
View file @
9bfad430
...
@@ -770,11 +770,9 @@ public class UserController {
...
@@ -770,11 +770,9 @@ public class UserController {
}
}
/**
/**
* @Author huych
* @Author hgw
* @Description 根据项目id和用户id查询csp部门信息
* @Description 判断用户的角色是否有菜单
* @Date 14:27 2025/3/10
* @Date 2025-9-5 10:00:19
* @Param
* @return
**/
**/
@Inner
@Inner
@PostMapping
(
"/inner/judgeDispatchAudit"
)
@PostMapping
(
"/inner/judgeDispatchAudit"
)
...
@@ -782,4 +780,15 @@ public class UserController {
...
@@ -782,4 +780,15 @@ public class UserController {
return
userService
.
judgeDispatchAudit
(
paramVo
);
return
userService
.
judgeDispatchAudit
(
paramVo
);
}
}
/**
* @Author hgw
* @Description 判断用户的权限(用户拼接用户组)是否有菜单
* @Date 2025-9-5 10:00:34
**/
@Inner
@PostMapping
(
"/inner/judgeDiyAuthMenuByUserId"
)
public
KeyValueReturnVo
judgeDiyAuthMenuByUserId
(
@RequestBody
ListAndStringVo
paramVo
)
{
return
userService
.
judgeDiyAuthMenuByUserId
(
paramVo
);
}
}
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/mapper/SysUserMapper.java
View file @
9bfad430
...
@@ -109,6 +109,9 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
...
@@ -109,6 +109,9 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
List
<
String
>
getCspUserByProjectNo
(
@Param
(
"projectNo"
)
String
projectNo
);
List
<
String
>
getCspUserByProjectNo
(
@Param
(
"projectNo"
)
String
projectNo
);
// 判断用户是否有菜单
// 判断用户
的角色
是否有菜单
List
<
KeyValueVo
>
judgeMenuByUserId
(
@Param
(
"idList"
)
List
<
String
>
idList
,
@Param
(
"menuId"
)
String
menuId
);
List
<
KeyValueVo
>
judgeMenuByUserId
(
@Param
(
"idList"
)
List
<
String
>
idList
,
@Param
(
"menuId"
)
String
menuId
);
// 判断用户的权限(用户拼接用户组)是否有菜单
List
<
KeyValueVo
>
judgeDiyAuthMenuByUserId
(
@Param
(
"idList"
)
List
<
String
>
idList
,
@Param
(
"menuId"
)
String
menuId
);
}
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/SysUserService.java
View file @
9bfad430
...
@@ -215,5 +215,9 @@ public interface SysUserService extends IService<SysUser> {
...
@@ -215,5 +215,9 @@ public interface SysUserService extends IService<SysUser> {
SysCspDeptVo
selectCspDeptByUserDeptId
(
SysCspDeptVo
vo
);
SysCspDeptVo
selectCspDeptByUserDeptId
(
SysCspDeptVo
vo
);
// 判断用户的角色是否有菜单
KeyValueReturnVo
judgeDispatchAudit
(
ListAndStringVo
paramVo
);
KeyValueReturnVo
judgeDispatchAudit
(
ListAndStringVo
paramVo
);
// 判断用户的权限(用户拼接用户组)是否有菜单
KeyValueReturnVo
judgeDiyAuthMenuByUserId
(
ListAndStringVo
paramVo
);
}
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java
View file @
9bfad430
...
@@ -1024,6 +1024,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
...
@@ -1024,6 +1024,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
return
vo
;
return
vo
;
}
}
/**
* @Description: 判断用户的角色是否有菜单
* @Author: hgw
* @Date: 2025/9/5 10:01
* @return: com.yifu.cloud.plus.v1.yifu.admin.api.vo.KeyValueReturnVo
**/
@Override
@Override
public
KeyValueReturnVo
judgeDispatchAudit
(
ListAndStringVo
paramVo
)
{
public
KeyValueReturnVo
judgeDispatchAudit
(
ListAndStringVo
paramVo
)
{
List
<
String
>
idList
=
paramVo
.
getIdList
();
List
<
String
>
idList
=
paramVo
.
getIdList
();
...
@@ -1034,6 +1040,29 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
...
@@ -1034,6 +1040,29 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
return
vo
;
return
vo
;
}
}
List
<
KeyValueVo
>
voList
=
baseMapper
.
judgeMenuByUserId
(
idList
,
menuId
);
List
<
KeyValueVo
>
voList
=
baseMapper
.
judgeMenuByUserId
(
idList
,
menuId
);
return
getKeyValueReturnVo
(
vo
,
voList
);
}
/**
* @Description: 判断用户的权限(用户拼接用户组)是否有菜单
* @Author: hgw
* @Date: 2025/9/5 10:01
* @return: com.yifu.cloud.plus.v1.yifu.admin.api.vo.KeyValueReturnVo
**/
@Override
public
KeyValueReturnVo
judgeDiyAuthMenuByUserId
(
ListAndStringVo
paramVo
)
{
List
<
String
>
idList
=
paramVo
.
getIdList
();
// 派单审核 menuId = "1549677464986763265"
String
menuId
=
paramVo
.
getIdString
();
KeyValueReturnVo
vo
=
new
KeyValueReturnVo
();
if
(
idList
==
null
||
idList
.
isEmpty
()
||
Common
.
isEmpty
(
menuId
))
{
return
vo
;
}
List
<
KeyValueVo
>
voList
=
baseMapper
.
judgeDiyAuthMenuByUserId
(
idList
,
menuId
);
return
getKeyValueReturnVo
(
vo
,
voList
);
}
private
KeyValueReturnVo
getKeyValueReturnVo
(
KeyValueReturnVo
vo
,
List
<
KeyValueVo
>
voList
)
{
if
(
voList
!=
null
&&
!
voList
.
isEmpty
())
{
if
(
voList
!=
null
&&
!
voList
.
isEmpty
())
{
Map
<
String
,
String
>
map
=
new
HashMap
<>();
Map
<
String
,
String
>
map
=
new
HashMap
<>();
for
(
KeyValueVo
keyValueVo
:
voList
)
{
for
(
KeyValueVo
keyValueVo
:
voList
)
{
...
...
yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml
View file @
9bfad430
...
@@ -415,7 +415,7 @@
...
@@ -415,7 +415,7 @@
) and a.del_flag='0'
) and a.del_flag='0'
</select>
</select>
<!-- 判断用户是否有菜单 -->
<!-- 判断用户是否有菜单
(用在户配置审核人办理人提交时的判断)
-->
<select
id=
"judgeMenuByUserId"
resultType=
"com.yifu.cloud.plus.v1.yifu.admin.api.vo.KeyValueVo"
>
<select
id=
"judgeMenuByUserId"
resultType=
"com.yifu.cloud.plus.v1.yifu.admin.api.vo.KeyValueVo"
>
select u.user_id keyStr,count(1) valueStr
select u.user_id keyStr,count(1) valueStr
from sys_user u
from sys_user u
...
@@ -431,4 +431,31 @@
...
@@ -431,4 +431,31 @@
and u.del_flag ='0' and r.del_flag='0' and m.del_flag='0'
and u.del_flag ='0' and r.del_flag='0' and m.del_flag='0'
GROUP BY u.user_id
GROUP BY u.user_id
</select>
</select>
<!-- 判断用户的数据权限是否有菜单(用在户配置审核人办理人提交时的判断) -->
<select
id=
"judgeDiyAuthMenuByUserId"
resultType=
"com.yifu.cloud.plus.v1.yifu.admin.api.vo.KeyValueVo"
>
select keyStr,count(1) valueStr from (
select
a.link_id keyStr
from sys_data_auth a
LEFT JOIN sys_diy_sql_menu_rel r on a.id=r.sys_data_auth_id
where a.link_type = '1' and r.menu_id = #{menuId}
and a.link_id in
<foreach
collection=
"idList"
item=
"ids"
open=
"("
separator=
","
close=
")"
>
#{ids}
</foreach>
union all
select
u.user_id keyStr
from sys_data_auth a
LEFT JOIN sys_diy_sql_menu_rel r on a.id=r.sys_data_auth_id
LEFT JOIN sys_user u on u.user_group=a.link_id
where a.link_type = '0' and r.menu_id = #{menuId}
and u.user_id in
<foreach
collection=
"idList"
item=
"ids"
open=
"("
separator=
","
close=
")"
>
#{ids}
</foreach>
) a
GROUP BY a.keyStr
</select>
</mapper>
</mapper>
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