Commit c3ecc9b8 authored by 赵啸非's avatar 赵啸非

添加水印图片

parent cd028478
...@@ -164,12 +164,12 @@ public class CertificateIndustryServiceImpl extends AbstractCRUDServiceImpl<Cert ...@@ -164,12 +164,12 @@ public class CertificateIndustryServiceImpl extends AbstractCRUDServiceImpl<Cert
@Override @Override
public List<CertificateIndustryTreeSelect> getListByParentId(Long parentId, Context context) { public List<CertificateIndustryTreeSelect> getListByParentId(Long parentId, Context context) {
if (ObjectUtils.isEmpty(parentId)) { if (ObjectUtils.isEmpty(parentId)) {
parentId = 0L; parentId = -1L;
} }
//只做一层 //只做一层
List<CertificateIndustryTreeSelect> collect = this.find(new CertificateIndustryQuery().parentId(parentId), context).stream().map(item -> new CertificateIndustryTreeSelect(item) List<CertificateIndustryTreeSelect> collect = this.find(new CertificateIndustryQuery().parentId(parentId), context).stream().map(item -> new CertificateIndustryTreeSelect(item)
).collect(Collectors.toList()); ).collect(Collectors.toList());
if (parentId==0L) { if (parentId==-1L) {
return collect; return collect;
} }
......
...@@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSONObject; ...@@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth; import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.annotation.DataPermission; import com.mortals.xhx.annotation.DataPermission;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
...@@ -18,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -18,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.*; import java.util.*;
import java.util.stream.Collector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.mortals.framework.ap.SysConstains.RESULT_KEY; import static com.mortals.framework.ap.SysConstains.RESULT_KEY;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment