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
56c34e9b
Commit
56c34e9b
authored
Jan 16, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.5' into MVP1.7.5
parents
eeea4fa6
059462d6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
WxLoginAuthenticationFilter.java
...plus/v1/yifu/auth/filter/WxLoginAuthenticationFilter.java
+1
-1
TInsuranceUnpurchasePersonServiceImpl.java
...y/service/impl/TInsuranceUnpurchasePersonServiceImpl.java
+3
-2
No files found.
yifu-auth/src/main/java/com/yifu/cloud/plus/v1/yifu/auth/filter/WxLoginAuthenticationFilter.java
View file @
56c34e9b
...
@@ -100,7 +100,7 @@ public class WxLoginAuthenticationFilter extends AbstractAuthenticationProcessin
...
@@ -100,7 +100,7 @@ public class WxLoginAuthenticationFilter extends AbstractAuthenticationProcessin
throw
new
AuthenticationServiceException
(
"获取企业微信用户失败"
);
throw
new
AuthenticationServiceException
(
"获取企业微信用户失败"
);
}
}
// log.info(JSONObject.toJSONString(userResult)); {"errcode":40014,"errmsg":"invalid access_token"}
//log.error(JSONObject.toJSONString(userResult));
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
userResult
);
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
userResult
);
if
(
StringUtils
.
equals
(
wxConfig
.
getAccossTokenInvliad
(),
jsonObject
.
getString
(
wxConfig
.
getErrcode
())))
{
if
(
StringUtils
.
equals
(
wxConfig
.
getAccossTokenInvliad
(),
jsonObject
.
getString
(
wxConfig
.
getErrcode
())))
{
wxConfig
.
removeAccessToken
(
agentId
);
wxConfig
.
removeAccessToken
(
agentId
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchasePersonServiceImpl.java
View file @
56c34e9b
...
@@ -166,9 +166,10 @@ public class TInsuranceUnpurchasePersonServiceImpl extends ServiceImpl<TInsuranc
...
@@ -166,9 +166,10 @@ public class TInsuranceUnpurchasePersonServiceImpl extends ServiceImpl<TInsuranc
if
(
listVoR
!=
null
&&
listVoR
.
getData
()
!=
null
if
(
listVoR
!=
null
&&
listVoR
.
getData
()
!=
null
&&
listVoR
.
getData
().
getListVo
()
!=
null
&&
!
listVoR
.
getData
().
getListVo
().
isEmpty
())
{
&&
listVoR
.
getData
().
getListVo
()
!=
null
&&
!
listVoR
.
getData
().
getListVo
().
isEmpty
())
{
List
<
String
>
socialList
=
listVoR
.
getData
().
getListVo
();
List
<
String
>
socialList
=
listVoR
.
getData
().
getListVo
();
Map
<
String
,
String
>
socialMap
=
new
HashMap
<>();
Map
<
String
,
Integer
>
socialMap
=
new
HashMap
<>();
Integer
value
=
CommonConstants
.
ONE_INT
;
for
(
String
s
:
socialList
)
{
for
(
String
s
:
socialList
)
{
socialMap
.
put
(
s
,
s
);
socialMap
.
put
(
s
,
value
);
}
}
// 更新为是在保
// 更新为是在保
List
<
String
>
updateZero
=
new
ArrayList
<>();
List
<
String
>
updateZero
=
new
ArrayList
<>();
...
...
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