...

renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java

@@ -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);

renren-admin/src/main/java/io/renren/modules/sys/dto/SysDeptDTO.java

@@ -24,101 +24,106 @@ import java.util.Date;
 public class SysDeptDTO extends TreeNode implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty(value = "id")
+    @ApiModelProperty(value = "id")
-	@Null(message="{id.null}", groups = AddGroup.class)
+    @Null(message = "{id.null}", groups = AddGroup.class)
-	@NotNull(message="{id.require}", groups = UpdateGroup.class)
+    @NotNull(message = "{id.require}", groups = UpdateGroup.class)
-	private Long id;
+    private Long id;
 
-	@ApiModelProperty(value = "上级ID")
+    @ApiModelProperty(value = "上级ID")
-	@NotNull(message="{sysdept.pid.require}", groups = DefaultGroup.class)
+    @NotNull(message = "{sysdept.pid.require}", groups = DefaultGroup.class)
-	private Long pid;
+    private Long pid;
 
-	@ApiModelProperty(value = "部门名称")
+    @ApiModelProperty(value = "部门名称")
-	@NotBlank(message="{sysdept.name.require}", groups = DefaultGroup.class)
+    @NotBlank(message = "{sysdept.name.require}", groups = DefaultGroup.class)
-	private String name;
+    private String name;
 
-	@ApiModelProperty(value = "类型：1省级部门，2市级部门，3区级部门，4企业")
+    @ApiModelProperty(value = "类型：1省级部门，2市级部门，3区级部门，4企业")
-	private Integer type;
+    private Integer type;
 
-	@ApiModelProperty(value = "地区")
+    @ApiModelProperty(value = "地区")
-	private Long district;
+    private Long district;
 
-	@ApiModelProperty(value = "排序")
+    @ApiModelProperty(value = "排序")
-	@Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
+    @Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
-	private Integer sort;
+    private Integer sort;
 
-	@ApiModelProperty(value = "创建时间")
+    @ApiModelProperty(value = "创建时间")
-	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-	private Date createDate;
+    private Date createDate;
 
-	@ApiModelProperty(value = "上级部门名称")
+    @ApiModelProperty(value = "上级部门名称")
-	private String parentName;
+    private String parentName;
 
-	@Override
+    @Override
-	public Long getId() {
+    public Long getId() {
-		return id;
+        return id;
-	}
+    }
 
-	@Override
+    @Override
-	public void setId(Long id) {
+    public void setId(Long id) {
-		this.id = id;
+        this.id = id;
-	}
+    }
 
-	@Override
+    @Override
-	public Long getPid() {
+    public Long getPid() {
-		return pid;
+        return pid;
-	}
+    }
 
-	@Override
+    @Override
-	public void setPid(Long pid) {
+    public void setPid(Long pid) {
-		this.pid = pid;
+        this.pid = pid;
-	}
+    }
 
-	public String getName() {
+    public String getName() {
-		return name;
+        return name;
-	}
+    }
 
-	public void setName(String name) {
+    public void setName(String name) {
-		this.name = name;
+        this.name = name;
-	}
+    }
 
-	public Integer getType() {
+    /**
-		return type;
+     * 类型：1省级部门，2市级部门，3区级部门，4企业
-	}
+     *
+     * @return
+     */
+    public Integer getType() {
+        return type;
+    }
 
-	public void setType(Integer type) {
+    public void setType(Integer type) {
-		this.type = type;
+        this.type = type;
-	}
+    }
 
-	public Long getDistrict() {
+    public Long getDistrict() {
-		return district;
+        return district;
-	}
+    }
 
-	public void setDistrict(Long district) {
+    public void setDistrict(Long district) {
-		this.district = district;
+        this.district = district;
-	}
+    }
 
-	public Integer getSort() {
+    public Integer getSort() {
-		return sort;
+        return sort;
-	}
+    }
 
-	public void setSort(Integer sort) {
+    public void setSort(Integer sort) {
-		this.sort = sort;
+        this.sort = sort;
-	}
+    }
 
-	public Date getCreateDate() {
+    public Date getCreateDate() {
-		return createDate;
+        return createDate;
-	}
+    }
 
-	public void setCreateDate(Date createDate) {
+    public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
+        this.createDate = createDate;
-	}
+    }
 
-	public String getParentName() {
+    public String getParentName() {
-		return parentName;
+        return parentName;
-	}
+    }
 
-	public void setParentName(String parentName) {
+    public void setParentName(String parentName) {
-		this.parentName = parentName;
+        this.parentName = parentName;
-	}
+    }
 }