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

修改了institutionAndUser(String userName)接口,当userName有值事搜索出此用户以及它所在的机构,userName为null时搜索全部

Browse Source 
添加getNext(String institutionId)接口,通过机构id返回此部门下的第一级部门和人员
添加getFirstInstitution()接口,返回机构第一级目录
This commit is contained in:
zhaokaiyao@91isoft.com
2021-07-21 11:30:44 +08:00
parent 4cee0f6bf5
commit 5825d8793f
8 changed files with 156 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
+14 -1
View File
@@ -20,7 +20,7 @@ public interface ITsInstitutionService extends IService<TsInstitution> {
*/
List<TsInstitution> getInstitution();
List<TsInstitution> getInstitutionAndUser();
List<TsInstitution> getInstitutionAndUser(String userName);
/**
* 批量插入机构
@@ -29,4 +29,17 @@ public interface ITsInstitutionService extends IService<TsInstitution> {
void batchInsert(List<TsInstitution> tsInstitutions);
public void parseInstitution() throws Exception;
/**
* 通过部门id获取他的子一级部门和人员
* @param institutionId
* @return
*/
public List<TsInstitution> getNext(String institutionId);
/**
* 获得第一级的部门
* @return
*/
public List<TsInstitution> getFirst();
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java
+23
View File
@@ -51,6 +51,29 @@ public class SarUserStarServiceImpl extends ServiceImpl<SarUserStarDao, SarUserS
}
// @Override
// public ResponseMessage<IPage<SarUserStar>> getUserStarList(PersonCollectEO personCollectEO) {
// if (personCollectEO.getUserId() == null) {
// return Result.error("userId不能为空");
// } else {
//
// QueryWrapper<SarUserStar> wrapper = new QueryWrapper<>();
// wrapper.eq("user_id", personCollectEO.getUserId());
// if(personCollectEO.getCollectType()!=null)wrapper.like("COLLECT_TYPE",personCollectEO.getCollectType());
// if(personCollectEO.getCollectTitle()!=null)wrapper.like("name",personCollectEO.getCollectTitle());
// if(sarUserStarEO.getModular()!=null)wrapper.like("modular",sarUserStarEO.getModular());
// if(sarUserStarEO.getInfo()!=null)wrapper.like("info",sarUserStarEO.getInfo());
// if(sarUserStarEO.getUrl()!=null)wrapper.like("url",sarUserStarEO.getUrl());
// IPage<SarUserStar> page = iSarUserStarService.page(new Page<>(sarUserStarEO.getCurrent(), sarUserStarEO.getSize()), wrapper);
// while (page.getRecords().remove(null)) ;
// return Result.success(page);
// }
// }
@Override
public ResponseMessage<IPage<SarUserStar>> deleteList(@RequestBody SarUserStarEO sarUserStars) {
if (sarUserStars.getUserId() == null) {