Merge branch 'zcwy-master' into zcwy0912

This commit is contained in:
joshen@zcwytd.com
2023-10-13 10:24:44 +08:00
2 changed files with 7 additions and 0 deletions

View File

@@ -68,6 +68,8 @@ public class TypeApi extends ApiBaseController {
if (StringUtil.equals(item.getParentId(), BaseConstant.TREEDATA_ROOT_PARENT_ID)) {
TypeVo vo = new TypeVo();
BeanUtils.copyProperties(item, vo);
vo.setCode(item.getId());
vo.setValue(item.getId());
ResDataManager rdm = resDataManagerMap.get(vo.getId());
if (rdm != null) {
User user = userService.get(rdm.getAid());
@@ -98,6 +100,8 @@ public class TypeApi extends ApiBaseController {
TypeVo vo = new TypeVo();
BeanUtils.copyProperties(item, vo);
vo.setParentName(typeVo.getName());
vo.setCode(item.getId());
vo.setValue(item.getId());
ResDataManager rdm = resDataManagerMap.get(vo.getId());
if (rdm != null) {
User user = userService.get(rdm.getAid());

View File

@@ -31,4 +31,7 @@ public class TypeVo extends Type {
* 资源数据管理人员
*/
private ResDataManager resDataManager;
private String code;
private String value;
}