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
cab64f29
Commit
cab64f29
authored
Apr 21, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.7.22-权限
parent
93cce868
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
3 deletions
+21
-3
ContractAlertSearchVo.java
...cloud/plus/v1/yifu/archives/vo/ContractAlertSearchVo.java
+3
-0
TEmpContractAlertController.java
...yifu/archives/controller/TEmpContractAlertController.java
+2
-0
TEmpContractAlertServiceImpl.java
...u/archives/service/impl/TEmpContractAlertServiceImpl.java
+5
-2
TEmpContractAlertMapper.xml
...biz/src/main/resources/mapper/TEmpContractAlertMapper.xml
+3
-0
EmployeeRegistrationLeaveController.java
...1/csp/controller/EmployeeRegistrationLeaveController.java
+4
-1
EmployeeRegistrationLeaveMapper.xml
...main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
+4
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ContractAlertSearchVo.java
View file @
cab64f29
...
...
@@ -103,4 +103,7 @@ public class ContractAlertSearchVo extends TEmpContractAlert {
@TableField
(
exist
=
false
)
@Schema
(
description
=
"前端客服"
)
private
String
customerUserLoginname
;
@Schema
(
description
=
"列表类型 1 待办 2监控 3入职确认信息"
)
private
String
type
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpContractAlertController.java
View file @
cab64f29
...
...
@@ -68,6 +68,7 @@ public class TEmpContractAlertController {
@Operation
(
description
=
"自动化合同续签待办查询"
)
@GetMapping
(
"/autoPage"
)
public
R
<
IPage
<
ContractAlertAutoVo
>>
getTEmpContractAlertAutoPage
(
Page
<
TEmpContractAlert
>
page
,
ContractAlertSearchVo
tEmpContractAlert
)
{
setAuth
(
tEmpContractAlert
);
//默认开启自动化的
tEmpContractAlert
.
setAutoFlag
(
CommonConstants
.
ZERO_STRING
);
return
R
.
ok
(
tEmpContractAlertService
.
getTEmpContractAlertAutoPage
(
page
,
tEmpContractAlert
));
...
...
@@ -103,6 +104,7 @@ public class TEmpContractAlertController {
ContractAlertSearchVo
tEmpContractAlert
=
new
ContractAlertSearchVo
();
//默认开启自动化的
tEmpContractAlert
.
setAutoFlag
(
CommonConstants
.
ZERO_STRING
);
setAuth
(
tEmpContractAlert
);
return
R
.
ok
(
tEmpContractAlertService
.
getTEmpContractAlertAutoCount
(
tEmpContractAlert
));
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @
cab64f29
...
...
@@ -1110,9 +1110,12 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
searchVo
.
setAuthSql
(
null
);
return
;
}
if
(
Common
.
isNotNull
(
searchVo
.
getType
())
&&
!
CommonConstants
.
TWO_STRING
.
equals
(
searchVo
.
getType
()))
{
// 非待办监控,走原逻辑,待办监控,走权限配置
//非管理员及SSC 走前端客服查询逻辑
searchVo
.
setCsLoginName
(
user
.
getUsername
());
}
}
public
boolean
haveRole
(
YifuUser
user
,
long
roleId
)
{
List
<
Long
>
roleList
=
user
.
getClientRoleMap
().
get
(
ClientNameConstants
.
CLIENT_MVP
);
for
(
Long
role
:
roleList
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpContractAlertMapper.xml
View file @
cab64f29
...
...
@@ -359,6 +359,9 @@
<if
test=
"tEmpContractAlert.autoFlag != null and tEmpContractAlert.autoFlag.trim() != ''"
>
AND a.AUTO_FLAG = #{tEmpContractAlert.autoFlag}
</if>
<if
test=
"tEmpContractAlert.authSql != null and tEmpContractAlert.authSql.trim() != ''"
>
${tEmpContractAlert.authSql}
</if>
</if>
</sql>
<!--tEmpContractAlert简单分页查询-->
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/controller/EmployeeRegistrationLeaveController.java
View file @
cab64f29
...
...
@@ -24,8 +24,8 @@ import com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationLeaveService;
import
com.yifu.cloud.plus.v1.csp.vo.BatchSureLeaveVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationLeaveSearchVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationLeaveTableVo
;
import
com.yifu.cloud.plus.v1.csp.vo.ErrorInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseServiceParamListVO
;
...
...
@@ -161,6 +161,9 @@ public class EmployeeRegistrationLeaveController {
private
void
setLeaveBaseAuth
(
EmployeeRegistrationLeaveSearchVo
searchVo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
searchVo
);
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
())
&&
searchVo
.
getAuthSql
().
contains
(
CommonConstants
.
A_DEPT_ID
))
{
searchVo
.
setAuthSql
(
searchVo
.
getAuthSql
().
replace
(
CommonConstants
.
A_DEPT_ID
,
"b.dept_id"
));
}
}
/**
...
...
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
View file @
cab64f29
...
...
@@ -372,6 +372,10 @@
AND a.emp_project_id = #{employeeRegistrationLeave.empProjectId}
</if>
<if
test=
"employeeRegistrationLeave.authSql != null and employeeRegistrationLeave.authSql.trim() != ''"
>
${employeeRegistrationLeave.authSql}
</if>
</if>
</sql>
...
...
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