Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dcs-plan
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
INET-TWO
server
dcs-plan
Commits
060c3383
Commit
060c3383
authored
Jul 30, 2024
by
wangqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ExtPlanController:业务代码迁入(2.x版本->4.1版本)--已全部编译通过
parent
d0a5ece1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
3 deletions
+11
-3
ExtPlanServiceImpl.java
.../yonde/dcs/plan/core/service/impl/ExtPlanServiceImpl.java
+11
-3
No files found.
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtPlanServiceImpl.java
View file @
060c3383
...
...
@@ -24,8 +24,11 @@ import com.yonde.dex.dao.service.util.DxPageUtils;
import
com.yonde.dex.dict.feign.DictDataFeignService
;
import
com.yonde.dex.dict.service.vo.DictDataVO
;
import
com.yonde.dex.user.common.vo.DxOrganizationVO
;
import
com.yonde.dex.user.common.vo.DxUserInfoVO
;
import
com.yonde.dex.user.feign.DxUserInfoFeign
;
import
com.yonde.dex.version.plugin.core.deleteType.IterationDeleteVO
;
import
dm.jdbc.util.StringUtil
;
import
lombok.val
;
import
org.apache.poi.ss.usermodel.CellStyle
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.stereotype.Service
;
...
...
@@ -77,16 +80,22 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
@Autowired
private
ExtDistributeRecordService
extDistributeRecordService
;
@Autowired
private
DxUserInfoFeign
userService
;
/**
* 通过userId获取组织名
*
* @param userId
* @return
*/
//todo wq:如何在4.1获取通过userId获取组织名?将2.0业务逻辑暂时注释,改为下方逻辑。
@Override
public
List
<
DxOrganizationVO
>
searchOrgNameByUserId
(
Long
userId
,
String
code
)
{
//todo 4.1中未找到对应的userservice,业务逻辑暂时注释
// UserVO user = this.userService.get(userId);
List
<
DxOrganizationVO
>
organizationVOs
=
new
ArrayList
<>();
DxUserInfoVO
user
=
this
.
userService
.
getByUserId
(
userId
);
organizationVOs
.
add
(
user
.
getDxOrganization
());
return
organizationVOs
;
// List<UserGroupRefVO> vos = this.userGroupRefService.findAllByUserAccount(user.getUserAccount());
// List<Long> groupIds = (List) vos.stream().filter((o) -> {
// return Objects.nonNull(o.getGroupId());
...
...
@@ -105,7 +114,6 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
// }
// List<OrganizationVO> organizationVO = this.searchOrganization(user, code);
// return organizationVO;
return
null
;
}
...
...
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