p96170835
/
diboot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://github.com/dibo-software/diboot-v2 into develop

This commit is contained in:
左春锐 2019-09-05 15:32:05 +08:00
parent 7dc37521dc 347150a1d5
commit 5d701db1be
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diboot-example/src/main/java/com/diboot/example/controller/SysUserController.java
View File

@ -169,8 +169,8 @@ public class SysUserController extends BaseCrudRestController {
modelMap.put("roleKvList", roleKvList);
//获取用户状态KV
List<KeyValue> userStatusKvList = dictionaryService.getKeyValueList(SysUser.USER_STATUS);
modelMap.put("userStatusKvList", userStatusKvList);
List<KeyValue> statusKvList = dictionaryService.getKeyValueList(SysUser.USER_STATUS);
modelMap.put("statusKvList", statusKvList);
//获取用户性别KV
List<KeyValue> genderKvList = dictionaryService.getKeyValueList(SysUser.GENDER);

4
diboot-example/src/main/java/com/diboot/example/service/impl/PositionServiceImpl.java
View File

@ -253,8 +253,8 @@ public class PositionServiceImpl extends BaseServiceImpl<PositionMapper, Positio
}
//获取职位
List<Position> positionList = super.getEntityListByIds(positionIdList);
List<PositionVO> volist = RelationsBinder.convertAndBind(positionList, PositionVO.class);
List<PositionVO> voTreeList = BeanUtils.buildTree(null, volist);
List<PositionVO> voList = RelationsBinder.convertAndBind(positionList, PositionVO.class);
List<PositionVO> voTreeList = BeanUtils.buildTree(null, voList);
return voTreeList;
}