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
cf539d03
Commit
cf539d03
authored
Aug 08, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.14' into MVP1.7.14
parents
1989a814
362733b2
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
93 additions
and
76 deletions
+93
-76
MenuUtil.java
...om/yifu/cloud/plus/v1/yifu/common/dapr/util/MenuUtil.java
+91
-74
TInsuranceDetailController.java
...ifu/insurances/controller/TInsuranceDetailController.java
+1
-1
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+1
-1
No files found.
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/MenuUtil.java
View file @
cf539d03
...
...
@@ -36,8 +36,11 @@ public class MenuUtil {
private
static
final
String
START_STR
=
"start"
;
public
void
setAuthSql
(
YifuUser
user
,
BaseEntity
entity
)
{
// 是否无权限,默认否
boolean
noAuth
=
false
;
// 普通用户:
if
(
user
!=
null
&&
Common
.
isNotNull
(
user
.
getId
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
user
.
getSystemFlag
()))
{
if
(
user
!=
null
&&
Common
.
isNotNull
(
user
.
getId
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
user
.
getSystemFlag
()))
{
// 菜单id
String
menuId
=
entity
.
getMId
();
if
(
Common
.
isEmpty
(
menuId
))
{
...
...
@@ -60,6 +63,11 @@ public class MenuUtil {
obj
=
cache
.
get
(
linkId
+
CommonConstants
.
DOWN_LINE_STRING
+
menuId
);
if
(
Common
.
isEmpty
(
obj
))
{
linkId
=
user
.
getUserGroup
();
// 无用户组,直接返回阻断sql
if
(
Common
.
isEmpty
(
linkId
))
{
entity
.
setAuthSql
(
" and 1=2 "
);
return
;
}
linkType
=
0
;
// 用户组
cache
=
cacheManager
.
getCache
(
CacheConstants
.
DATA_AUTH_DETAILS
+
linkType
);
if
(
cache
!=
null
)
{
...
...
@@ -85,7 +93,7 @@ public class MenuUtil {
if
(
sql
.
contains
(
"#settleDomainId"
))
{
// 获取人员项目权限
R
<
TSettleDomainListVo
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
()
,
daprArchivesProperties
.
getAppId
(),
"/tsettledomain/getSettleDomainIdsByUserId"
,
daprArchivesProperties
.
getAppId
(),
"/tsettledomain/getSettleDomainIdsByUserId"
,
user
.
getId
(),
TSettleDomainListVo
.
class
,
SecurityConstants
.
FROM_IN
);
StringBuilder
deptStr
=
new
StringBuilder
();
if
(
res
!=
null
&&
CommonConstants
.
SUCCESS
==
res
.
getCode
()
...
...
@@ -100,9 +108,9 @@ public class MenuUtil {
}
String
userIds
=
"0"
;
if
(
sql
.
contains
(
START_STR
))
{
String
deptIds
=
StringUtils
.
substringBetween
(
sql
,
START_STR
,
"end"
);
String
deptIds
=
StringUtils
.
substringBetween
(
sql
,
START_STR
,
"end"
);
R
<
String
>
userIdR
=
HttpDaprUtil
.
invokeMethodPost
(
daprUpmsProperties
.
getAppUrl
()
,
daprUpmsProperties
.
getAppId
(),
"/user/inner/getUserIdByDeptIds"
,
deptIds
,
daprUpmsProperties
.
getAppId
(),
"/user/inner/getUserIdByDeptIds"
,
deptIds
,
String
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
userIdR
!=
null
&&
CommonConstants
.
SUCCESS
==
userIdR
.
getCode
())
{
userIds
=
userIdR
.
getData
();
...
...
@@ -112,8 +120,8 @@ public class MenuUtil {
}
if
(
sql
.
contains
(
"#deptId"
))
{
R
<
String
>
userIdR
=
HttpDaprUtil
.
invokeMethodPost
(
daprUpmsProperties
.
getAppUrl
()
,
daprUpmsProperties
.
getAppId
(),
"/user/inner/getUserIdByDeptIds"
,
String
.
valueOf
(
user
.
getDeptId
()),
String
.
class
,
SecurityConstants
.
FROM_IN
);
,
daprUpmsProperties
.
getAppId
(),
"/user/inner/getUserIdByDeptIds"
,
String
.
valueOf
(
user
.
getDeptId
()),
String
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
userIdR
!=
null
&&
CommonConstants
.
SUCCESS
==
userIdR
.
getCode
())
{
userIds
=
userIdR
.
getData
();
}
...
...
@@ -125,7 +133,16 @@ public class MenuUtil {
}
}
}
}
else
{
noAuth
=
true
;
}
}
}
else
{
noAuth
=
true
;
}
// 无权限的,默认无数据
if
(
noAuth
)
{
entity
.
setAuthSql
(
" and 1=2 "
);
}
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @
cf539d03
...
...
@@ -881,7 +881,7 @@ public class TInsuranceDetailController {
* @return
*/
@Operation
(
description
=
"查询在用或者在途的商险数据"
)
@
Ge
tMapping
(
"/getOnProcessInsurancesInfo"
)
@
Pos
tMapping
(
"/getOnProcessInsurancesInfo"
)
public
R
<
List
<
TInsurancePreDetail
>>
getInProcessInsurancesInfo
(
@RequestParam
String
empIdcard
)
{
return
R
.
ok
(
tInsuranceDetailService
.
getOnProcessInsurancesInfo
(
empIdcard
));
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
cf539d03
...
...
@@ -619,7 +619,7 @@
t_insurance_detail a
where
a.DELETE_FLAG = 0
and (a.BUY_HANDLE_STATUS in (1,2) or (a.BUY_HANDLE_STATUS = 3 and a.
isEffect = 0 and a.isOverdue
= 0))
and (a.BUY_HANDLE_STATUS in (1,2) or (a.BUY_HANDLE_STATUS = 3 and a.
IS_EFFECT = 0 and a.IS_OVERDUE
= 0))
AND EMP_IDCARD_NO = #{empIdCard}
</select>
...
...
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