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
9ea70364
You need to sign in or sign up before continuing.
Commit
9ea70364
authored
Mar 10, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入离职登记提交
parent
4f95525d
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
186 additions
and
8 deletions
+186
-8
EmpProjectStatusVo.java
...fu/cloud/plus/v1/yifu/archives/vo/EmpProjectStatusVo.java
+1
-0
TEmployeeProjectBelongDeptController.java
...ives/controller/TEmployeeProjectBelongDeptController.java
+15
-0
TEmployeeProjectBelongDeptService.java
...u/archives/service/TEmployeeProjectBelongDeptService.java
+3
-0
TEmployeeProjectBelongDeptServiceImpl.java
...s/service/impl/TEmployeeProjectBelongDeptServiceImpl.java
+15
-0
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+2
-0
ArchivesDaprUtil.java
...cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
+12
-0
UpmsDaprUtils.java
...fu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java
+12
-0
EmployeeRegistration.java
...m/yifu/cloud/plus/v1/csp/entity/EmployeeRegistration.java
+4
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+24
-4
SysCspDeptVo.java
...om/yifu.cloud.plus.v1/yifu/admin/api/vo/SysCspDeptVo.java
+36
-0
UserController.java
...u/cloud/plus/v1/yifu/admin/controller/UserController.java
+25
-0
SysUserDeptPermissionMapper.java
...lus/v1/yifu/admin/mapper/SysUserDeptPermissionMapper.java
+3
-0
SysUserDeptPermissionService.java
...s/v1/yifu/admin/service/SysUserDeptPermissionService.java
+3
-0
SysUserService.java
...yifu/cloud/plus/v1/yifu/admin/service/SysUserService.java
+3
-4
SysUserDeptPermissionServiceImpl.java
.../admin/service/impl/SysUserDeptPermissionServiceImpl.java
+6
-0
SysUserServiceImpl.java
...d/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java
+12
-0
SysUserDeptPermissionMapper.xml
...src/main/resources/mapper/SysUserDeptPermissionMapper.xml
+10
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpProjectStatusVo.java
View file @
9ea70364
...
...
@@ -18,4 +18,5 @@ public class EmpProjectStatusVo implements Serializable {
private
String
empIdcard
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
projectTime
;
private
String
empProjectId
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectBelongDeptController.java
View file @
9ea70364
...
...
@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectBelongDeptService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectScpVO
;
...
...
@@ -29,6 +30,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.UserPermissionVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
...
...
@@ -182,4 +184,17 @@ public class TEmployeeProjectBelongDeptController {
return
R
.
ok
(
tEmployeeProjectBelongDeptService
.
getNoneDeptCount
(
tEmployeeProjectBelongDept
));
}
/**
* @Author huych
* @Description 根据项目id和用户id查询csp部门信息
* @Date 14:27 2025/3/10
* @Param
* @return
**/
@Inner
@PostMapping
(
"/inner/selectInnerCspDeptByUserDeptId"
)
public
R
<
Boolean
>
saveOrDeleteDeptRelation
(
@RequestBody
SysCspDeptVo
vo
)
{
return
R
.
ok
(
tEmployeeProjectBelongDeptService
.
saveOrDeleteDeptRelation
(
vo
));
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectBelongDeptService.java
View file @
9ea70364
...
...
@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.service;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectScpVO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchVo
;
...
...
@@ -76,4 +77,6 @@ public interface TEmployeeProjectBelongDeptService extends IService<TEmployeePro
*/
Integer
getNoneDeptCount
(
TEmployeeProjectBelongDeptSearchVo
tEmployeeProjectBelongDept
);
Boolean
saveOrDeleteDeptRelation
(
SysCspDeptVo
vo
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectBelongDeptServiceImpl.java
View file @
9ea70364
...
...
@@ -22,6 +22,7 @@ import com.alibaba.excel.write.metadata.WriteSheet;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeProjectBelongDeptMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectBelongDeptService
;
...
...
@@ -191,4 +192,18 @@ public class TEmployeeProjectBelongDeptServiceImpl extends ServiceImpl<TEmployee
public
Integer
getNoneDeptCount
(
TEmployeeProjectBelongDeptSearchVo
tEmployeeProjectBelongDept
)
{
return
baseMapper
.
getNoneDeptCount
(
tEmployeeProjectBelongDept
);
}
@Override
public
Boolean
saveOrDeleteDeptRelation
(
SysCspDeptVo
vo
)
{
if
(
Common
.
isNotNull
(
vo
.
getDepartName
()))
{
TEmployeeProjectBelongDept
dept
=
new
TEmployeeProjectBelongDept
();
dept
.
setId
(
vo
.
getProjectId
());
dept
.
setEmpDeptid
(
vo
.
getDepartId
().
toString
());
dept
.
setEmpDeptname
(
vo
.
getDepartName
());
this
.
save
(
dept
);
}
else
{
this
.
removeById
(
vo
.
getProjectId
());
}
return
true
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
9ea70364
...
...
@@ -155,6 +155,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
employeeProject
))
{
vo
.
setProjectTime
(
employeeProject
.
getCreateTime
());
vo
.
setEmpProjectId
(
employeeProject
.
getId
());
return
vo
;
}
return
null
;
...
...
@@ -169,6 +170,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ONE_INT
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
employeeProject
))
{
vo
.
setProjectTime
(
employeeProject
.
getLeaveTime
());
vo
.
setEmpProjectId
(
employeeProject
.
getId
());
return
vo
;
}
return
null
;
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @
9ea70364
...
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.TypeReference
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TBusinessEmployeeExtendInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
...
...
@@ -518,4 +519,15 @@ public class ArchivesDaprUtil {
public
R
<
Boolean
>
selectExitEmpProject
(
TInsuranceUnpurchasePersonCardVo
cardVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeeproject/inner/selectExitEmpProject"
,
JSON
.
toJSONString
(
cardVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
/**
* @Author huyc
* @Description 新增或者删除项目档案与所属部门的关联表
* @Date 17:07 2025/3/10
* @Param
* @return
**/
public
R
<
Boolean
>
saveOrDeleteDeptRelation
(
SysCspDeptVo
vo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeeprojectbelongdept/inner/saveOrDeleteDeptRelation"
,
JSON
.
toJSONString
(
vo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java
View file @
9ea70364
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
common
.
dapr
.
util
;
import
com.alibaba.fastjson.JSON
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
...
...
@@ -129,4 +130,15 @@ public class UpmsDaprUtils {
public
R
<
Boolean
>
selectExitDeptCompany
(
String
deptId
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprUpmsProperties
.
getAppUrl
(),
daprUpmsProperties
.
getAppId
(),
"/user/inner/selectExitDeptCompany"
,
deptId
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
/**
* @Author huyc
* @Description 判断部门是否属于分公司
* @Date 10:38 2025/1/20
* @Param
* @return
**/
public
R
<
SysCspDeptVo
>
selectCspDeptByUserDeptId
(
SysCspDeptVo
vo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprUpmsProperties
.
getAppUrl
(),
daprUpmsProperties
.
getAppId
(),
"/user/inner/selectInnerCspDeptByUserDeptId"
,
JSON
.
toJSONString
(
vo
),
SysCspDeptVo
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/entity/EmployeeRegistration.java
View file @
9ea70364
...
...
@@ -98,6 +98,10 @@ public class EmployeeRegistration extends BaseEntity {
@TableField
(
exist
=
false
)
private
int
outNum
;
@Schema
(
description
=
"项目档案id"
)
@TableField
(
exist
=
false
)
private
String
empProjectId
;
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
9ea70364
...
...
@@ -24,6 +24,7 @@ import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationHrExportVo;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationVo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmpProjectStatusVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo
;
...
...
@@ -393,6 +394,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
logService
.
saveLog
(
registration
.
getId
(),
CommonConstants
.
ZERO_STRING
,
RegistConstants
.
MESSAGE_FINISH
,
registration
.
getProjectCreateTime
(),
user
.
getNickname
(),
CommonConstants
.
ONE_STRING
.
equals
(
registrationNow
.
getFeedbackType
())
?
RegistConstants
.
BEFORE_IN_PROJECT
:
RegistConstants
.
BEFORE_OUT_PROJECT
);
SysCspDeptVo
vo
=
new
SysCspDeptVo
();
if
(
CommonConstants
.
ONE_STRING
.
equals
(
registrationNow
.
getFeedbackType
()))
{
vo
.
setDepartName
(
registrationNow
.
getEmpDeptname
());
vo
.
setDepartId
(
Long
.
valueOf
(
registrationNow
.
getEmpDeptid
()));
}
vo
.
setProjectId
(
registration
.
getEmpProjectId
());
archivesDaprUtil
.
saveOrDeleteDeptRelation
(
vo
);
baseMapper
.
updateById
(
registrationNow
);
return
R
.
ok
();
}
...
...
@@ -459,12 +467,24 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//数据初始化
private
void
initRegistInfo
(
EmployeeRegistration
insert
,
YifuUser
user
,
TSettleDomainSelectVo
selectVo
)
{
SysCspDeptVo
vo
=
new
SysCspDeptVo
();
vo
.
setUserId
(
user
.
getId
());
vo
.
setProjectId
(
selectVo
.
getId
());
R
<
SysCspDeptVo
>
booleanR
=
upmsDaprUtils
.
selectCspDeptByUserDeptId
(
vo
);
if
(
Common
.
isEmpty
(
booleanR
)
||
Common
.
isEmpty
(
booleanR
.
getData
()))
{
insert
.
setRegistorDeptname
(
user
.
getDeptName
());
insert
.
setRegistorDeptid
(
user
.
getDeptId
().
toString
());
insert
.
setRegistorUsername
(
user
.
getNickname
());
insert
.
setRegistorPhone
(
user
.
getPhone
());
insert
.
setEmpDeptid
(
user
.
getDeptId
().
toString
());
insert
.
setEmpDeptname
(
user
.
getDeptName
());
}
else
{
vo
=
booleanR
.
getData
();
insert
.
setRegistorDeptname
(
vo
.
getDepartName
());
insert
.
setRegistorDeptid
(
vo
.
getDepartId
().
toString
());
insert
.
setEmpDeptid
(
vo
.
getDepartId
().
toString
());
insert
.
setEmpDeptname
(
vo
.
getDepartName
());
}
insert
.
setRegistorUsername
(
user
.
getNickname
());
insert
.
setRegistorPhone
(
user
.
getPhone
());
insert
.
setCustomerPhone
(
selectVo
.
getCsPhone
());
insert
.
setCustomerUsername
(
selectVo
.
getCsName
());
insert
.
setCustomerUserLoginname
(
selectVo
.
getCsLoginName
());
...
...
yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/vo/SysCspDeptVo.java
0 → 100644
View file @
9ea70364
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
admin
.
api
.
vo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDept
;
import
lombok.Data
;
/**
* csp部门信息
*
* @author huych
* @since 1.9.7
*/
@Data
public
class
SysCspDeptVo
extends
SysDept
{
/**
* 部门名称
*/
private
String
departName
;
/**
* 部门id
*/
private
Long
departId
;
/**
* 用户id
*/
private
String
userId
;
/**
* 项目id
*/
private
String
projectId
;
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/UserController.java
View file @
9ea70364
...
...
@@ -665,4 +665,29 @@ public class UserController {
@RequestParam
(
required
=
false
)
String
nickname
)
{
return
userService
.
cspUserPage
(
page
,
deptId
,
username
,
nickname
);
}
/**
* @Author huych
* @Description 根据项目id和用户id查询csp部门信息
* @Date 14:27 2025/3/10
* @Param
* @return
**/
@Inner
@PostMapping
(
"/inner/selectInnerCspDeptByUserDeptId"
)
public
R
<
SysCspDeptVo
>
selectInnerCspDeptByUserDeptId
(
@RequestBody
SysCspDeptVo
vo
)
{
return
userService
.
selectCspDeptByUserDeptId
(
vo
);
}
/**
* @Author huych
* @Description 根据项目id和用户id查询csp部门信息
* @Date 14:27 2025/3/10
* @Param
* @return
**/
@PostMapping
(
"/selectCspDeptByUserDeptId"
)
public
R
<
SysCspDeptVo
>
selectCspDeptByUserDeptId
(
@RequestBody
SysCspDeptVo
vo
)
{
return
userService
.
selectCspDeptByUserDeptId
(
vo
);
}
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/mapper/SysUserDeptPermissionMapper.java
View file @
9ea70364
...
...
@@ -18,6 +18,7 @@ package com.yifu.cloud.plus.v1.yifu.admin.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUserDeptPermission
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -36,4 +37,6 @@ public interface SysUserDeptPermissionMapper extends BaseMapper<SysUserDeptPermi
List
<
SysUserDeptPermission
>
getUserDeptPermissionList
(
@Param
(
"userId"
)
String
userId
);
SysCspDeptVo
selectCasDeptVo
(
@Param
(
"userId"
)
String
userId
,
@Param
(
"projectId"
)
String
projectId
);
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/SysUserDeptPermissionService.java
View file @
9ea70364
...
...
@@ -18,6 +18,7 @@ package com.yifu.cloud.plus.v1.yifu.admin.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUserDeptPermission
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.UserCspVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.UserPermissionVo
;
...
...
@@ -64,4 +65,6 @@ public interface SysUserDeptPermissionService extends IService<SysUserDeptPermis
R
<
Boolean
>
updateByIdAsso
(
UserCspVO
entity
);
R
<
Boolean
>
removeUserDeptPermissionById
(
String
userId
,
String
projectNo
);
SysCspDeptVo
selectCasDeptVo
(
String
userId
,
String
projectId
);
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/SysUserService.java
View file @
9ea70364
...
...
@@ -23,10 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import
com.yifu.cloud.plus.v1.yifu.admin.api.dto.UserDTO
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.dto.UserInfo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.BusinessUserVo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.UserExcelVO
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.UserPasswordVo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.UserVO
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
org.springframework.validation.BindingResult
;
...
...
@@ -215,4 +212,6 @@ public interface SysUserService extends IService<SysUser> {
R
<
IPage
<
SysUser
>>
cspUserPage
(
Page
page
,
String
deptId
,
String
userName
,
String
nickName
);
R
<
SysCspDeptVo
>
selectCspDeptByUserDeptId
(
SysCspDeptVo
vo
);
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserDeptPermissionServiceImpl.java
View file @
9ea70364
...
...
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDept
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUserDeptPermission
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.UserCspVO
;
import
com.yifu.cloud.plus.v1.yifu.admin.constants.UserDeptPermConstants
;
import
com.yifu.cloud.plus.v1.yifu.admin.mapper.SysDeptMapper
;
...
...
@@ -408,4 +409,9 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
}
return
R
.
failed
(
Boolean
.
FALSE
,
CommonConstants
.
RESULT_DATA_FAIL
);
}
@Override
public
SysCspDeptVo
selectCasDeptVo
(
String
userId
,
String
projectId
)
{
return
baseMapper
.
selectCasDeptVo
(
userId
,
projectId
);
}
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java
View file @
9ea70364
...
...
@@ -1012,4 +1012,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
return
R
.
ok
(
baseMapper
.
cspUserPage
(
page
,
deptId
,
userName
,
nickName
,
dept
.
getProjectNo
()));
}
@Override
public
R
<
SysCspDeptVo
>
selectCspDeptByUserDeptId
(
SysCspDeptVo
vo
)
{
SysCspDeptVo
returnVo
=
userDeptPermissionService
.
selectCasDeptVo
(
vo
.
getUserId
(),
vo
.
getProjectId
());
if
(
Common
.
isEmpty
(
returnVo
))
{
return
null
;
}
else
{
vo
.
setDepartName
(
returnVo
.
getDepartName
());
vo
.
setDepartId
(
returnVo
.
getDepartId
());
}
return
R
.
ok
(
vo
);
}
}
yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysUserDeptPermissionMapper.xml
View file @
9ea70364
...
...
@@ -59,4 +59,14 @@
FROM sys_user_dept_permission a
WHERE a.user_id = #{userId}
</select>
<select
id=
"selectCasDeptVo"
resultType=
"com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo"
>
SELECT
b.name as departName,
a.dept_id as departId
FROM sys_user_dept_permission a
inner join sys_dept b on a.dept_id = b.dept_id
WHERE a.user_id = #{userId} and a.project_id = #{projectId}
limit 1
</select>
</mapper>
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