Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
haoban3.0
haoban-manage3.0
Commits
16c3365b
Commit
16c3365b
authored
Jan 14, 2025
by
徐高华
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/xgh/代开发调整25年' into 'developer'
企微自建转代开发调整 See merge request
!2416
parents
512c7657
5bad9b5f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletions
+4
-1
WxEnterpriseController.java
.../haoban/manage/web/controller/WxEnterpriseController.java
+4
-1
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java
View file @
16c3365b
...
...
@@ -211,9 +211,12 @@ public class WxEnterpriseController extends WebBaseController {
if
(
wxType
==
5
)
{
desc
=
" ( "
+
wxEnterpriseDTO
.
getWxaAppid
()
+
" / "
+
wxEnterpriseDTO
.
getUrlHost
()+
") "
;
}
if
(
wxType
==
6
)
{
desc
=
"仅代开发"
;
}
int
newType
=
this
.
wxEnterpriseApiService
.
calcSecretType
(
wxEnterpriseId
)
;
String
diff
=
""
;
if
(
null
!=
wxType
&&
wxType
.
intValue
()
!=
newType
&&
wxType
!=
5
)
{
if
(
null
!=
wxType
&&
wxType
.
intValue
()
!=
newType
&&
wxType
!=
5
&&
wxType
!=
6
)
{
diff
=
"*"
;
}
return
Arrays
.
asList
(
wxEnterpriseDTO
.
getWxCorpid
(),
wxEnterpriseDTO
.
getOpenCorpid
()).
stream
().
filter
(
str
->
StringUtils
.
isNotBlank
(
str
)).
collect
(
Collectors
.
joining
(
" / "
))
+
desc
+
diff
;
...
...
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