guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '1212-八项作业迁移' into czks1.0 

# Conflicts:
#	pom.xml
#	src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java
#	src/main/java/com/zcloud/service/system/DictionariesService.java
#	src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java
#	src/main/resources/application-dev.properties
#	src/main/resources/application-master.properties
pull/14/head
dearlin 2023-12-22 09:12:18 +08:00
parent 43edc5ee1e 2bdacb3f08
commit c1431c47db
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java
View File

@ -83,8 +83,8 @@ public class GFBlindBoardServiceImpl implements GFBlindBoardService {
public PageData findById(PageData pd)throws Exception{ public PageData findById(PageData pd)throws Exception{
PageData pageData = GFblindboardMapper.findById(pd); PageData pageData = GFblindboardMapper.findById(pd);
//调用接口 获取用户信息 //调用接口 获取用户信息
String workUser = corpFgsService.getXgfUserName(pageData.getString("WORK_USER")); //String workUser = corpFgsService.getXgfUserName(pageData.getString("WORK_USER"));
pageData.put("WORK_USER",workUser); //pageData.put("WORK_USER",workUser);
return pageData; return pageData;
} }

4
src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java
View File

@ -82,8 +82,8 @@ public class GFHighWorkServiceImpl implements GFHighWorkService {
public PageData findById(PageData pd)throws Exception{ public PageData findById(PageData pd)throws Exception{
PageData pageData = GFhighworkMapper.findById(pd); PageData pageData = GFhighworkMapper.findById(pd);
//调用接口 获取用户信息 //调用接口 获取用户信息
String workUser = corpFgsService.getXgfUserName(pageData.getString("PROJECT_MANAGER")); //String workUser = corpFgsService.getXgfUserName(pageData.getString("PROJECT_MANAGER"));
pageData.put("PROJECT_MANAGER",workUser); //pageData.put("PROJECT_MANAGER",workUser);
return pageData; return pageData;
} }