|
@@ -1,24 +1,24 @@
|
|
|
package com.yonge.cooleshow.biz.dal.service.impl;
|
|
|
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
-import com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo;
|
|
|
-
|
|
|
import org.apache.commons.beanutils.BeanUtils;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import com.yonge.cooleshow.biz.dal.dao.SubjectDao;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.Subject;
|
|
|
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
|
|
|
import com.yonge.cooleshow.biz.dal.queryInfo.SubjectQueryInfo;
|
|
|
import com.yonge.cooleshow.biz.dal.service.SubjectService;
|
|
|
+import com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo;
|
|
|
import com.yonge.cooleshow.common.dal.BaseDAO;
|
|
|
import com.yonge.cooleshow.common.page.PageInfo;
|
|
|
import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
|
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
@Service
|
|
|
public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implements SubjectService {
|
|
@@ -138,7 +138,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
|
|
|
* @updateTime 2022/4/6 11:33
|
|
|
* @return: com.yonge.cooleshow.biz.dal.entity.Subject
|
|
|
*/
|
|
|
- private Subject getTree(Subject sub, YesOrNoEnum yesOrNoEnum) {
|
|
|
+ private Subject getTree(Subject sub, boolean yesOrNoEnum) {
|
|
|
//得到根节点对象
|
|
|
//获取子节点list
|
|
|
List<Subject> subjects = subjectDao.findByParentId(sub.getId(), yesOrNoEnum);
|