Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
feeb8922
Commit
feeb8922
authored
4 years ago
by
邓实川
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
8小时短信签名更新-8小时协同办公
parent
672b5c1a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
7 deletions
+11
-7
src/main/java/cn/timer/api/controller/zcgl/ZcglController.java
+8
-4
src/main/resources/application-dev.yml
+1
-1
src/main/resources/application-pro.yml
+1
-1
src/main/resources/application-test.yml
+1
-1
No files found.
src/main/java/cn/timer/api/controller/zcgl/ZcglController.java
View file @
feeb8922
...
...
@@ -308,8 +308,10 @@ public class ZcglController {
zcglQueryDto
.
getTotalPage
()
==
null
?
10
:
zcglQueryDto
.
getTotalPage
());
QueryWrapper
<
ZcglAdminZccrkgl
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"status"
,
0
).
between
(!
StrUtil
.
hasBlank
(
s
)
&&
!
StrUtil
.
hasBlank
(
e
),
"grsj_time"
,
!
StrUtil
.
hasBlank
(
s
)
?
s
:
"1000-01-01 00:00:00"
,
!
StrUtil
.
hasBlank
(
e
)
?
e
:
"9999-01-01 00:00:00"
)
queryWrapper
.
eq
(
"org_code"
,
userBean
.
getOrgCode
()).
eq
(
"status"
,
0
)
.
between
(!
StrUtil
.
hasBlank
(
s
)
&&
!
StrUtil
.
hasBlank
(
e
),
"grsj_time"
,
!
StrUtil
.
hasBlank
(
s
)
?
s
:
"1000-01-01 00:00:00"
,
!
StrUtil
.
hasBlank
(
e
)
?
e
:
"9999-01-01 00:00:00"
)
.
and
(!
StrUtil
.
hasBlank
(
q
),
wq
->
wq
.
like
(
"zcmc"
,
q
).
or
().
like
(
"zcggxh"
,
q
).
or
().
like
(
"zcgys"
,
q
).
or
().
like
(
"zcbh"
,
q
));
...
...
@@ -336,8 +338,10 @@ public class ZcglController {
zcglQueryDto
.
getTotalPage
()
==
null
?
10
:
zcglQueryDto
.
getTotalPage
());
QueryWrapper
<
ZcglAdminZccrkgl
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"status"
,
1
).
between
(!
StrUtil
.
hasBlank
(
s
)
&&
!
StrUtil
.
hasBlank
(
e
),
"grsj_time"
,
!
StrUtil
.
hasBlank
(
s
)
?
s
:
"1000-01-01 00:00:00"
,
!
StrUtil
.
hasBlank
(
e
)
?
e
:
"9999-01-01 00:00:00"
)
queryWrapper
.
eq
(
"org_code"
,
userBean
.
getOrgCode
()).
eq
(
"status"
,
1
)
.
between
(!
StrUtil
.
hasBlank
(
s
)
&&
!
StrUtil
.
hasBlank
(
e
),
"grsj_time"
,
!
StrUtil
.
hasBlank
(
s
)
?
s
:
"1000-01-01 00:00:00"
,
!
StrUtil
.
hasBlank
(
e
)
?
e
:
"9999-01-01 00:00:00"
)
.
and
(!
StrUtil
.
hasBlank
(
q
),
wq
->
wq
.
like
(
"zcmc"
,
q
).
or
().
like
(
"zcggxh"
,
q
).
or
().
like
(
"zcgys"
,
q
).
or
().
like
(
"zcbh"
,
q
));
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application-dev.yml
View file @
feeb8922
...
...
@@ -176,7 +176,7 @@ config-8timer:
register-company-max-num
:
100
#默认最大公司数量
register-childAccount-max-num
:
10
#默认最大子账号数量
Aliyun
:
# 阿里云
PROJECT_NAME
:
8小时人事管家
PROJECT_NAME
:
8小时
协同办公#8小时
人事管家
REGION_ID
:
cn-shenzhen
ACCESSKEY_ID
:
LTAI4FuaShJWQ1dggsFWG5CC
SECRET
:
EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application-pro.yml
View file @
feeb8922
...
...
@@ -151,7 +151,7 @@ config-8timer:
register-company-max-num
:
100
register-childAccount-max-num
:
10
Aliyun
:
# 阿里云
PROJECT_NAME
:
8小时人事管家
PROJECT_NAME
:
8小时
协同办公#8小时
人事管家
REGION_ID
:
cn-shenzhen
ACCESSKEY_ID
:
LTAI4FuaShJWQ1dggsFWG5CC
SECRET
:
EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application-test.yml
View file @
feeb8922
...
...
@@ -150,7 +150,7 @@ config-8timer:
register-company-max-num
:
100
register-childAccount-max-num
:
10
Aliyun
:
# 阿里云
PROJECT_NAME
:
8小时人事管家
PROJECT_NAME
:
8小时
协同办公#8小时
人事管家
REGION_ID
:
cn-shenzhen
ACCESSKEY_ID
:
LTAI4FuaShJWQ1dggsFWG5CC
SECRET
:
EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR
...
...
This diff is collapsed.
Click to expand it.
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