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
9bbe9e32
Commit
9bbe9e32
authored
Sep 27, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
8c04d50a
859bb1a2
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
174 additions
and
105 deletions
+174
-105
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+1
-2
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+7
-7
Common.java
.../com/yifu.cloud.plus.v1/yifu/common/core/util/Common.java
+3
-3
MenuUtil.java
...om/yifu/cloud/plus/v1/yifu/common/dapr/util/MenuUtil.java
+4
-2
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+22
-27
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+16
-8
TOrderServiceImpl.java
...ud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
+15
-1
TOrderMapper.xml
...yifu-order-biz/src/main/resources/mapper/TOrderMapper.xml
+23
-19
TSalaryAccountController.java
...s/v1/yifu/salary/controller/TSalaryAccountController.java
+17
-14
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+3
-0
TConfigSalaryServiceImpl.java
...v1/yifu/salary/service/impl/TConfigSalaryServiceImpl.java
+1
-1
TDispatchInfoController.java
...us/v1/yifu/social/controller/TDispatchInfoController.java
+19
-17
UserController.java
...u.cloud.plus.v1/yifu/admin/controller/UserController.java
+21
-0
SysDataAuthServiceImpl.java
...us.v1/yifu/admin/service/impl/SysDataAuthServiceImpl.java
+22
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
9bbe9e32
...
...
@@ -2247,8 +2247,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
for
(
Map
.
Entry
<
String
,
EmpProjectDispatchVo
>
entry
:
projectsMap
.
entrySet
())
{
projectAdd
=
entry
.
getValue
();
try
{
if
(
Common
.
isNotNull
(
projectAdd
))
;
{
if
(
Common
.
isNotNull
(
projectAdd
))
{
project
=
new
TEmployeeProject
();
BeanUtil
.
copyProperties
(
projectAdd
,
project
);
if
(
Common
.
isEmpty
(
project
.
getEmpId
())
&&
Common
.
isNotNull
(
empAddsMap
))
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
9bbe9e32
...
...
@@ -492,7 +492,7 @@
<include
refid=
"baseParam"
/>
from t_employee_info a
<if
test=
"tEmployeeInfo.authSql != null and tEmployeeInfo.authSql.contains('b.DEPT_ID') "
>
left join t_employee_project b on a.id=b.EMP_ID
left join t_employee_project b on a.id=b.EMP_ID
and b.DELETE_FLAG = '0'
</if>
where a.DELETE_FLAG = '0'
<include
refid=
"employeeInfo_where"
/>
...
...
@@ -517,8 +517,8 @@
,a.LEAVE_USER
,a.LEAVE_REASON
from t_employee_info a
left join t_employee_project b on a.id = b.EMP_ID
where a.DELETE_FLAG = '0'
and b.DELETE_FLAG = '0'
left join t_employee_project b on a.id = b.EMP_ID
and b.DELETE_FLAG = '0'
where a.DELETE_FLAG = '0'
<include
refid=
"employeeInfo_where"
/>
<if
test=
"tEmployeeInfo.authSql != null and tEmployeeInfo.authSql.trim() != ''"
>
${tEmployeeInfo.authSql}
...
...
@@ -629,9 +629,9 @@
select
<include
refid=
"Base_Export_List"
/>
from t_employee_info a
left join t_employee_project b on a.id = b.EMP_ID
left join t_employee_project b on a.id = b.EMP_ID
and b.DELETE_FLAG = '0'
<where>
a.DELETE_FLAG = '0'
and b.DELETE_FLAG = '0'
a.DELETE_FLAG = '0'
<include
refid=
"employeeInfo_where"
/>
<if
test=
"tEmployeeInfo.authSql != null and tEmployeeInfo.authSql.trim() != ''"
>
${tEmployeeInfo.authSql}
...
...
@@ -652,9 +652,9 @@
,a.LEAVE_USER_NAME
,a.LEAVE_REASON
from t_employee_info a
left join t_employee_project b on a.id = b.EMP_ID
left join t_employee_project b on a.id = b.EMP_ID
and b.DELETE_FLAG = '0'
<where>
a.DELETE_FLAG = '0'
and b.DELETE_FLAG = '0'
a.DELETE_FLAG = '0'
<include
refid=
"employeeInfo_where"
/>
<if
test=
"tEmployeeInfo.authSql != null and tEmployeeInfo.authSql.trim() != ''"
>
${tEmployeeInfo.authSql}
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/util/Common.java
View file @
9bbe9e32
...
...
@@ -59,11 +59,11 @@ public class Common {
* @author: fxj
*/
public
static
boolean
isEmpty
(
Object
obj
)
{
return
null
==
obj
||
""
.
equals
(
obj
);
return
null
==
obj
||
""
.
equals
(
obj
)
||
"null"
.
equals
(
obj
)
;
}
public
static
boolean
isNotNull
(
Object
obj
)
{
return
null
!=
obj
&&
!
""
.
equals
(
obj
);
return
null
!=
obj
&&
!
""
.
equals
(
obj
)
&&
!
"null"
.
equals
(
obj
)
;
}
public
static
boolean
isNotEmpty
(
List
obj
)
{
...
...
@@ -71,7 +71,7 @@ public class Common {
}
public
static
boolean
isNotNull
(
String
obj
)
{
if
(
null
!=
obj
&&
!
""
.
equals
(
obj
)
&&
!
"undefined"
.
equals
(
obj
))
{
if
(
null
!=
obj
&&
!
""
.
equals
(
obj
)
&&
!
"undefined"
.
equals
(
obj
)
&&
!
"null"
.
equals
(
obj
)
)
{
return
true
;
}
return
false
;
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/MenuUtil.java
View file @
9bbe9e32
...
...
@@ -78,7 +78,7 @@ public class MenuUtil {
}
if
(
Common
.
isNotNull
(
obj
))
{
SimpleValueWrapper
objs
=
(
SimpleValueWrapper
)
obj
;
if
(
objs
!=
null
)
{
if
(
Common
.
isNotNull
(
objs
)
)
{
String
sql
=
String
.
valueOf
(
objs
.
get
());
if
(
sql
.
contains
(
"#create_by"
))
{
sql
=
sql
.
replace
(
"#create_by"
,
user
.
getId
());
...
...
@@ -121,10 +121,12 @@ public class MenuUtil {
sql
=
sql
.
replace
(
"#deptId"
,
userIds
);
//sql = sql.replace(" or dept.dept_id = #deptId ", "")
}
if
(
Common
.
isNotNull
(
sql
))
{
entity
.
setAuthSql
(
sql
);
}
}
}
}
}
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
9bbe9e32
...
...
@@ -3357,7 +3357,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
param
.
setCreateBy
(
user
.
getId
());
menuUtil
.
setAuthSql
(
user
,
param
);
IPage
<
InsuredListVo
>
insuranceList
=
new
Page
<>()
;
IPage
<
InsuredListVo
>
insuranceList
;
insuranceList
=
this
.
baseMapper
.
getInsuredListPage
(
page
,
param
);
if
(
CollectionUtils
.
isNotEmpty
(
insuranceList
.
getRecords
())){
//根据项目编码获取项目名称
...
...
@@ -3389,12 +3389,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
@Override
public
R
getInsuredList
(
InsuredParam
param
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
List
<
String
>
deptList
=
getDeptNoList
(
user
);
List
<
InsuredListVo
>
insuredList
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isEmpty
(
deptList
)){
return
R
.
ok
(
insuredList
);
}
param
.
setDeptNoList
(
deptList
);
param
.
setCreateBy
(
user
.
getId
());
menuUtil
.
setAuthSql
(
user
,
param
);
List
<
InsuredListVo
>
insuredList
;
insuredList
=
this
.
baseMapper
.
getInsuredList
(
param
);
if
(
CollectionUtils
.
isNotEmpty
(
insuredList
)){
if
(
insuredList
.
size
()
>
CommonConstants
.
EXPORT_TWENTY_THOUSAND
){
...
...
@@ -3475,12 +3472,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
@Override
public
R
getInsuranceRefundList
(
InsuranceRefundParam
param
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
List
<
String
>
deptNoList
=
getDeptNoList
(
user
);
List
<
InsuranceRefundListVo
>
pageList
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isEmpty
(
deptNoList
)){
return
R
.
ok
(
pageList
);
}
param
.
setDeptNoList
(
deptNoList
);
param
.
setCreateBy
(
user
.
getId
());
menuUtil
.
setAuthSql
(
user
,
param
);
List
<
InsuranceRefundListVo
>
insuranceRefundList
=
this
.
baseMapper
.
getInsuranceRefundList
(
param
);
if
(
CollectionUtils
.
isNotEmpty
(
insuranceRefundList
)){
if
(
insuranceRefundList
.
size
()
>
CommonConstants
.
EXPORT_TWENTY_THOUSAND
){
...
...
@@ -5870,6 +5863,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return
R
.
failed
(
InsurancesConstants
.
ORDER_NO_IS_EMPTY
);
}
if
(
user
!=
null
&&
Common
.
isNotNull
(
user
.
getId
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
user
.
getSystemFlag
()))
{
String
sql
;
// 获取人员项目权限
R
<
TSettleDomainListVo
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
()
...
...
@@ -5886,6 +5880,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
sql
=
"and (1=2 or a.dept_id in ('0'#settleDomainId))"
;
sql
=
sql
.
replace
(
"#settleDomainId"
,
deptStr
.
toString
());
param
.
setAuthSql
(
sql
);
}
//查询所有保单信息
IPage
<
InsuredOrderListVo
>
orderInsuredList
=
baseMapper
.
getOrderInsuredListPage
(
page
,
param
);
return
R
.
ok
(
orderInsuredList
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
9bbe9e32
...
...
@@ -526,6 +526,9 @@
a.CREATE_NAME as createName
from
t_insurance_detail a
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
left join t_insurance_area_res p on p.USER_ID = #{param.createBy}
</if>
where
a.DELETE_FLAG = 0
and
...
...
@@ -573,6 +576,10 @@
<if
test=
"param.createEndTime != null and param.createEndTime.trim() != ''"
>
AND a.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.createEndTime}, ' 23:59:59')
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
</if>
GROUP BY a.id
ORDER BY a.CREATE_TIME DESC
</select>
<!-- 已减员列表分页查询-->
...
...
@@ -657,8 +664,11 @@
a.DIE_DISABLE_QUOTA as dieDisableQuota,
refund.CREATE_TIME as refundCreateTime
from
t_insurance_detail a,
t_insurance_refund refund
(t_insurance_detail a,
t_insurance_refund refund)
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
left join t_insurance_area_res p on p.USER_ID = #{param.createBy}
</if>
where
a.REFUND_ID = refund.ID
and
...
...
@@ -674,12 +684,6 @@
<if
test=
"param.deptNo != null and param.deptNo.trim() != ''"
>
and a.DEPT_NO = #{param.deptNo}
</if>
<if
test=
"param.deptNo == null or param.deptNo.trim() == ''"
>
and a.DEPT_NO in
<foreach
collection=
"param.deptNoList"
index=
"index"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
<if
test=
"param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''"
>
and a.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
</if>
...
...
@@ -699,6 +703,10 @@
(a.POLICY_END
<![CDATA[ >= ]]>
concat(#{param.policyStart}, ' 00:00:00') and a.POLICY_END
<![CDATA[ <= ]]>
concat(#{param.policyEnd}, ' 23:59:59'))
)
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
</if>
GROUP BY a.id
ORDER BY refund.CREATE_TIME DESC
</select>
<!-- 减员办理列表分页查询-->
...
...
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
View file @
9bbe9e32
...
...
@@ -92,7 +92,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
if
(
Common
.
isNotNull
(
param
.
getAuthSql
())
&&
param
.
getAuthSql
().
contains
(
"#create_depts"
))
{
String
userIds
=
"0"
;
R
<
String
>
userIdR
=
HttpDaprUtil
.
invokeMethodPost
(
daprUpmsProperties
.
getAppUrl
()
,
daprUpmsProperties
.
getAppId
(),
"/user/inner/getUser
I
dByDeptIds"
,
user
.
getDeptId
()
,
daprUpmsProperties
.
getAppId
(),
"/user/inner/getUser
Name
dByDeptIds"
,
user
.
getDeptId
()
,
String
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
userIdR
!=
null
&&
CommonConstants
.
SUCCESS
==
userIdR
.
getCode
())
{
userIds
=
userIdR
.
getData
();
...
...
@@ -113,6 +113,20 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
@Override
public
R
<
List
<
OrderListVO
>>
getOrderList
(
OrderListParam
param
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
param
);
if
(
Common
.
isNotNull
(
param
.
getAuthSql
())
&&
param
.
getAuthSql
().
contains
(
"#create_name"
))
{
param
.
setAuthSql
(
param
.
getAuthSql
().
replace
(
"#create_name"
,
user
.
getUsername
()));
}
if
(
Common
.
isNotNull
(
param
.
getAuthSql
())
&&
param
.
getAuthSql
().
contains
(
"#create_depts"
))
{
String
userIds
=
"0"
;
R
<
String
>
userIdR
=
HttpDaprUtil
.
invokeMethodPost
(
daprUpmsProperties
.
getAppUrl
()
,
daprUpmsProperties
.
getAppId
(),
"/user/inner/getUserNamedByDeptIds"
,
user
.
getDeptId
()
,
String
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
userIdR
!=
null
&&
CommonConstants
.
SUCCESS
==
userIdR
.
getCode
())
{
userIds
=
userIdR
.
getData
();
}
param
.
setAuthSql
(
param
.
getAuthSql
().
replace
(
"#create_depts"
,
userIds
));
}
List
<
OrderListVO
>
list
;
if
(
CollectionUtils
.
isNotEmpty
(
param
.
getIdList
())){
list
=
baseMapper
.
getOrderListBySelect
(
param
.
getIdList
());
...
...
yifu-order/yifu-order-biz/src/main/resources/mapper/TOrderMapper.xml
View file @
9bbe9e32
...
...
@@ -86,39 +86,43 @@
</select>
<select
id=
"getOrderList"
resultType=
"com.yifu.cloud.plus.v1.yifu.order.vo.OrderListVO"
>
select
t
.id as id,
t
.ORDER_NO as orderNo,
t
.CREATE_TIME as createTime,
t
.CREATE_NAME as createName,
t
.CUSTOMER_NAME as customerName,
t
.DEPT_NAME as deptName,
t
.DEPT_NO as deptNo,
t
.ORDER_STATUS as orderStatus
from t_order
t
where t.DELETE_FLAG = 0
and #{userName} in (SELECT HANDLE_USER FROM t_order_handler h WHERE h.ORDER_NO = t.ORDER_NO)
select
a
.id as id,
a
.ORDER_NO as orderNo,
a
.CREATE_TIME as createTime,
a
.CREATE_NAME as createName,
a
.CUSTOMER_NAME as customerName,
a
.DEPT_NAME as deptName,
a
.DEPT_NO as deptNo,
a
.ORDER_STATUS as orderStatus
from t_order
a
left join t_order_handler h on h.ORDER_NO = a.ORDER_NO
where a.DELETE_FLAG = 0
<if
test=
"param.orderNo != null and param.orderNo.trim() != ''"
>
and
t
.ORDER_NO = #{param.orderNo}
and
a
.ORDER_NO = #{param.orderNo}
</if>
<if
test=
"param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''"
>
and
t.CREATE_TIME
<![CDATA[ >= ]]>
concat(#{param.startDate}, ' 00:00:00') and t
.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.endDate}, ' 23:59:59')
and
a.CREATE_TIME
<![CDATA[ >= ]]>
concat(#{param.startDate}, ' 00:00:00') and a
.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.endDate}, ' 23:59:59')
</if>
<if
test=
"param.createName != null and param.createName.trim() != ''"
>
and
t
.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
and
a
.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
</if>
<if
test=
"param.customerName != null and param.customerName.trim() != ''"
>
and
t
.CUSTOMER_NAME = #{param.customerName}
and
a
.CUSTOMER_NAME = #{param.customerName}
</if>
<if
test=
"param.deptName != null and param.deptName.trim() != ''"
>
and
t
.DEPT_NAME = #{param.deptName}
and
a
.DEPT_NAME = #{param.deptName}
</if>
<if
test=
"param.deptNo != null and param.deptNo.trim() != ''"
>
and
t
.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
and
a
.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
</if>
<if
test=
"param.orderStatus != null"
>
and
t
.ORDER_STATUS = #{param.orderStatus}
and
a
.ORDER_STATUS = #{param.orderStatus}
</if>
ORDER BY t.CREATE_TIME DESC
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
</if>
GROUP BY a.ID
ORDER BY a.CREATE_TIME DESC
</select>
<select
id=
"getOrderDetailById"
resultType=
"com.yifu.cloud.plus.v1.yifu.order.vo.OrderDetailVO"
>
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryAccountController.java
View file @
9bbe9e32
...
...
@@ -100,6 +100,8 @@ public class TSalaryAccountController {
public
R
<
IPage
<
TSalaryAccount
>>
getTSalaryAccountPageOrder
(
Page
<
TSalaryAccount
>
page
,
TSalaryAccountSearchVo
tSalaryAccount
)
{
tSalaryAccount
.
setDeleteFlag
(
CommonConstants
.
ZERO_INT
);
YifuUser
user
=
SecurityUtils
.
getUser
();
// 普通用户:
if
(
user
!=
null
&&
Common
.
isNotNull
(
user
.
getId
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
user
.
getSystemFlag
()))
{
String
sql
;
// 获取人员项目权限
R
<
TSettleDomainListVo
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
()
...
...
@@ -116,6 +118,7 @@ public class TSalaryAccountController {
sql
=
"and (1=2 or a.dept_id in ('0'#settleDomainId))"
;
sql
=
sql
.
replace
(
"#settleDomainId"
,
deptStr
.
toString
());
tSalaryAccount
.
setAuthSql
(
sql
);
}
return
new
R
<>(
tSalaryAccountService
.
getTSalaryAccountPage
(
page
,
tSalaryAccount
));
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
9bbe9e32
...
...
@@ -131,6 +131,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
configSalary
=
configSalaryService
.
getById
(
configId
);
}
else
{
configSalary
=
configSalaryService
.
getById
(
CommonConstants
.
ONE_STRING
);
if
(
Common
.
isEmpty
(
configSalary
))
{
configSalary
=
new
TConfigSalary
();
}
}
try
{
jsonString
=
URLDecoder
.
decode
(
jsonString
,
"UTF-8"
).
replace
(
"="
,
""
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TConfigSalaryServiceImpl.java
View file @
9bbe9e32
...
...
@@ -37,7 +37,7 @@ public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, T
public
R
<
IPage
<
TConfigSalary
>>
getTConfigSalaryPage
(
Page
<
TConfigSalary
>
page
,
TConfigSalary
tConfigSalary
){
YifuUser
user
=
SecurityUtils
.
getUser
();
TSettleDomainListVo
vo
=
null
;
if
(
Common
.
isNotNull
(
user
))
{
if
(
Common
.
isNotNull
(
user
)
&&
CommonConstants
.
ONE_STRING
.
equals
(
user
.
getSystemFlag
())
)
{
R
<
TSettleDomainListVo
>
domainListVoR
=
archivesDaprUtil
.
getSettleDomainIdsByUserId
(
user
.
getId
());
if
(
Common
.
isEmpty
(
domainListVoR
))
{
return
R
.
failed
(
"调用结算服务失败"
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @
9bbe9e32
...
...
@@ -136,6 +136,7 @@ public class TDispatchInfoController {
tDispatchInfo
.
setCreateBy
(
user
.
getId
());
tDispatchInfo
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
if
(
user
!=
null
&&
Common
.
isNotNull
(
user
.
getId
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
user
.
getSystemFlag
()))
{
String
sql
;
// 获取人员项目权限
R
<
TSettleDomainListVo
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
()
...
...
@@ -155,6 +156,7 @@ public class TDispatchInfoController {
if
(
Common
.
isNotNull
(
tDispatchInfo
.
getAuthSql
())
&&
tDispatchInfo
.
getAuthSql
().
contains
(
CommonConstants
.
A_DEPT_ID
))
{
tDispatchInfo
.
setAuthSql
(
tDispatchInfo
.
getAuthSql
().
replace
(
CommonConstants
.
A_DEPT_ID
,
"a.SETTLE_DOMAIN"
));
}
}
return
new
R
<>(
tDispatchInfoService
.
getTDispatchInfoPage
(
page
,
tDispatchInfo
));
}
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/UserController.java
View file @
9bbe9e32
...
...
@@ -341,4 +341,25 @@ public class UserController {
}
return
userIds
.
toString
();
}
/**
* @Author hgw
* @Description 获取部门下的用户id
* @Date 2022-9-14 11:29:59
**/
@Inner
@PostMapping
(
value
=
{
"/inner/getUserNamedByDeptIds"
})
public
String
getUserNameByDeptIds
(
@RequestBody
String
deptIds
)
{
StringBuilder
userIds
=
new
StringBuilder
(
"'0'"
);
if
(
Common
.
isNotNull
(
deptIds
))
{
List
<
String
>
list
=
Common
.
initStrToList
(
deptIds
,
","
);
List
<
SysUser
>
sysUsers
=
userService
.
list
(
Wrappers
.<
SysUser
>
query
().
lambda
().
in
(
SysUser:
:
getDeptId
,
list
));
if
(
Common
.
isNotEmpty
(
sysUsers
)){
for
(
SysUser
u:
sysUsers
){
userIds
.
append
(
",'"
).
append
(
u
.
getUsername
()).
append
(
"'"
);
}
}
}
return
userIds
.
toString
();
}
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/service/impl/SysDataAuthServiceImpl.java
View file @
9bbe9e32
...
...
@@ -418,11 +418,29 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa
* @return: void
**/
public
void
deleteSubInfoByMainId
(
String
mainId
)
{
SysDataAuth
a
=
this
.
getById
(
mainId
);
if
(
a
!=
null
)
{
Cache
cache
=
cacheManager
.
getCache
(
CacheConstants
.
DATA_AUTH_DETAILS
+
a
.
getLinkType
());
if
(
cache
!=
null
)
{
List
<
SysDataAuthMenuRel
>
authMenuList
=
authMenuRelService
.
getByMainId
(
mainId
);
List
<
SysDiySqlMenuRel
>
diySqlMenuList
=
diySqlMenuRelService
.
getByMainId
(
mainId
);
if
(
authMenuList
!=
null
&&
!
authMenuList
.
isEmpty
())
{
for
(
SysDataAuthMenuRel
sd
:
authMenuList
)
{
cache
.
put
(
a
.
getLinkId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
sd
.
getMenuId
(),
null
);
}
}
if
(
diySqlMenuList
!=
null
&&
!
diySqlMenuList
.
isEmpty
())
{
for
(
SysDiySqlMenuRel
dsd
:
diySqlMenuList
)
{
cache
.
put
(
a
.
getLinkId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
dsd
.
getMenuId
(),
null
);
}
}
authDeptRelService
.
deleteAuthDeptRelByAuthId
(
mainId
);
authMenuRelService
.
deleteAuthMenuRelByAuthId
(
mainId
);
diySqlService
.
deleteDiySqlByAuthId
(
mainId
);
diySqlMenuRelService
.
deleteSqlMenuRelByAuthId
(
mainId
);
}
}
}
/**
* 删除
...
...
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