...
This commit is contained in:
wangliwen
parent
92542c2ad8
commit
368d78f48f
|
|
@ -233,8 +233,11 @@ public class AbilityCenterControllerV3 {
|
|||
auditingBaseDTO.setCompleteEntry(Boolean.TRUE); // 首次录入
|
||||
auditingBaseDTO.setFlowType("能力申请");
|
||||
|
||||
// TODO
|
||||
if (user.getDeptId() != null) {
|
||||
SysDeptDTO applyUserDeptDTO = sysDeptService.get(user.getDeptId()); // 发起人的部门
|
||||
applyUserDeptDTO.getType(); // 发起人
|
||||
sysDeptDTO.getType(); // 资源所属部门
|
||||
}
|
||||
|
||||
Map<String, Object> variables = oMapper.convertValue(auditingBaseDTO, Map.class);
|
||||
|
|
|
|||
|
|
@ -24,101 +24,106 @@ import java.util.Date;
|
|||
public class SysDeptDTO extends TreeNode implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "id")
|
||||
@Null(message="{id.null}", groups = AddGroup.class)
|
||||
@NotNull(message="{id.require}", groups = UpdateGroup.class)
|
||||
private Long id;
|
||||
@ApiModelProperty(value = "id")
|
||||
@Null(message = "{id.null}", groups = AddGroup.class)
|
||||
@NotNull(message = "{id.require}", groups = UpdateGroup.class)
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty(value = "上级ID")
|
||||
@NotNull(message="{sysdept.pid.require}", groups = DefaultGroup.class)
|
||||
private Long pid;
|
||||
@ApiModelProperty(value = "上级ID")
|
||||
@NotNull(message = "{sysdept.pid.require}", groups = DefaultGroup.class)
|
||||
private Long pid;
|
||||
|
||||
@ApiModelProperty(value = "部门名称")
|
||||
@NotBlank(message="{sysdept.name.require}", groups = DefaultGroup.class)
|
||||
private String name;
|
||||
@ApiModelProperty(value = "部门名称")
|
||||
@NotBlank(message = "{sysdept.name.require}", groups = DefaultGroup.class)
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty(value = "类型：1省级部门，2市级部门，3区级部门，4企业")
|
||||
private Integer type;
|
||||
@ApiModelProperty(value = "类型：1省级部门，2市级部门，3区级部门，4企业")
|
||||
private Integer type;
|
||||
|
||||
@ApiModelProperty(value = "地区")
|
||||
private Long district;
|
||||
@ApiModelProperty(value = "地区")
|
||||
private Long district;
|
||||
|
||||
@ApiModelProperty(value = "排序")
|
||||
@Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
|
||||
private Integer sort;
|
||||
@ApiModelProperty(value = "排序")
|
||||
@Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
|
||||
private Integer sort;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||
private Date createDate;
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||
private Date createDate;
|
||||
|
||||
@ApiModelProperty(value = "上级部门名称")
|
||||
private String parentName;
|
||||
@ApiModelProperty(value = "上级部门名称")
|
||||
private String parentName;
|
||||
|
||||
@Override
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
@Override
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
@Override
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Long getPid() {
|
||||
return pid;
|
||||
}
|
||||
@Override
|
||||
public Long getPid() {
|
||||
return pid;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPid(Long pid) {
|
||||
this.pid = pid;
|
||||
}
|
||||
@Override
|
||||
public void setPid(Long pid) {
|
||||
this.pid = pid;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public Integer getType() {
|
||||
return type;
|
||||
}
|
||||
/**
|
||||
* 类型：1省级部门，2市级部门，3区级部门，4企业
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public Integer getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(Integer type) {
|
||||
this.type = type;
|
||||
}
|
||||
public void setType(Integer type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public Long getDistrict() {
|
||||
return district;
|
||||
}
|
||||
public Long getDistrict() {
|
||||
return district;
|
||||
}
|
||||
|
||||
public void setDistrict(Long district) {
|
||||
this.district = district;
|
||||
}
|
||||
public void setDistrict(Long district) {
|
||||
this.district = district;
|
||||
}
|
||||
|
||||
public Integer getSort() {
|
||||
return sort;
|
||||
}
|
||||
public Integer getSort() {
|
||||
return sort;
|
||||
}
|
||||
|
||||
public void setSort(Integer sort) {
|
||||
this.sort = sort;
|
||||
}
|
||||
public void setSort(Integer sort) {
|
||||
this.sort = sort;
|
||||
}
|
||||
|
||||
public Date getCreateDate() {
|
||||
return createDate;
|
||||
}
|
||||
public Date getCreateDate() {
|
||||
return createDate;
|
||||
}
|
||||
|
||||
public void setCreateDate(Date createDate) {
|
||||
this.createDate = createDate;
|
||||
}
|
||||
public void setCreateDate(Date createDate) {
|
||||
this.createDate = createDate;
|
||||
}
|
||||
|
||||
public String getParentName() {
|
||||
return parentName;
|
||||
}
|
||||
public String getParentName() {
|
||||
return parentName;
|
||||
}
|
||||
|
||||
public void setParentName(String parentName) {
|
||||
this.parentName = parentName;
|
||||
}
|
||||
public void setParentName(String parentName) {
|
||||
this.parentName = parentName;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue