FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

审查流程

Browse Source
This commit is contained in:
yuezhihang
2022-04-11 16:22:16 +08:00
parent e88337fa9e
commit c22104afab
9 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java
+2 -1
View File
@@ -4,6 +4,7 @@ package com.adc.da.slrs.sarInstitution.controller;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
import com.adc.da.slrs.sarInstitution.entity.TsUserVO;
import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService;
import com.adc.da.slrs.sarUser.dao.TsUserDao;
import com.adc.da.slrs.sarUser.entity.TsUser;
@@ -105,7 +106,7 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
@ApiOperation("获得下一级的部门和人员")
@GetMapping("/getNextById")
public List<TsInstitution> getNextById(String ids){
public List<TsUserVO> getNextById(String ids){
return tsInstitutionService.getNextById(ids);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
+2 -1
View File
@@ -1,6 +1,7 @@
package com.adc.da.slrs.sarInstitution.service;
import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
import com.adc.da.slrs.sarInstitution.entity.TsUserVO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
@@ -39,7 +40,7 @@ public interface ITsInstitutionService extends IService<TsInstitution> {
public List<TsInstitution> getInstitutionIdToDept(String institutionIds,String userName);
public List<TsInstitution> getNextById(String ids);
public List<TsUserVO> getNextById(String ids);
/**
* 获得第一级的部门
adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
+5 -5
View File
@@ -226,19 +226,19 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
return tsInstitutions;
}
public List<TsInstitution> getNextById(String ids){
public List<TsUserVO> getNextById(String ids){
List<String> strings=new ArrayList<>(Arrays.asList(ids.split(",")));
List<TsUserVO> tsUsers=tsInstitutionDao.selectNextUserByIds(strings);
List<TsInstitution> res=new ArrayList<>();
List<TsUserVO> res=new ArrayList<>();
if (null!=tsUsers && tsUsers.size()>0){
Map<String,TsUserVO> middle=new HashMap<>();
for (TsUserVO u:tsUsers) {
middle.put(u.getId(),u);
}
strings.forEach(s -> {
TsInstitution ins=new TsInstitution();
BeanUtils.copyProperties(middle.get(s),ins);
res.add(ins);
// TsInstitution ins=new TsInstitution();
// BeanUtils.copyProperties(middle.get(s),ins);
res.add(middle.get(s));
});
}
return res;