代码提交
parent
3b470b4dd8
commit
a870a3f92e
|
|
@ -2,7 +2,6 @@ package com.whdc.controller;
|
||||||
|
|
||||||
|
|
||||||
import cn.dev33.satoken.stp.StpUtil;
|
import cn.dev33.satoken.stp.StpUtil;
|
||||||
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
|
|
||||||
import com.whdc.model.entity.Organization;
|
import com.whdc.model.entity.Organization;
|
||||||
import com.whdc.model.entity.UnitDict;
|
import com.whdc.model.entity.UnitDict;
|
||||||
import com.whdc.model.group.Insert;
|
import com.whdc.model.group.Insert;
|
||||||
|
|
@ -15,7 +14,6 @@ import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.collections.CollectionUtils;
|
import org.apache.commons.collections.CollectionUtils;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
@ -64,7 +62,7 @@ public class OrganizationController {
|
||||||
.setSort(o.getSort())
|
.setSort(o.getSort())
|
||||||
.setFsort(o.getFsort())
|
.setFsort(o.getFsort())
|
||||||
.setFcid(o.getFcid())
|
.setFcid(o.getFcid())
|
||||||
.setType("2");
|
.setType("1");
|
||||||
list.add(fcCommVo);
|
list.add(fcCommVo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -101,7 +99,7 @@ public class OrganizationController {
|
||||||
.setSort(o.getSort())
|
.setSort(o.getSort())
|
||||||
.setFsort(o.getFsort())
|
.setFsort(o.getFsort())
|
||||||
.setFcid(o.getFcid())
|
.setFcid(o.getFcid())
|
||||||
.setType("3");
|
.setType("1");
|
||||||
list.add(fcCommVo);
|
list.add(fcCommVo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ public class Organization extends Model<Organization> implements Serializable {
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@ApiModelProperty(value = "置顶类型")
|
@ApiModelProperty(value = "置顶类型")
|
||||||
private String type = "2";
|
private String type = "0";
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@ApiModelProperty(value = "单位")
|
@ApiModelProperty(value = "单位")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue