消防机构删除VO

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgDepartmentDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -72,4 +76,6 @@ public class OrgDepartmentDto extends BaseDto {
     @TableField(fill= FieldFill.INSERT_UPDATE)
     private String recUserName;
 
+    @ApiModelProperty(value = "动态表单值")
+    private List<AlertFormValue> alertFormValue;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgDepartmentFormVo.java → amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgDepartmentFormDto.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
+package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,7 +20,7 @@ import java.util.List;
 @Accessors(chain = true)
 @TableName("cb_org_usr")
 @ApiModel(value="OrgUsrVo", description="人员信息")
-public class OrgDepartmentFormVo {
+public class OrgDepartmentFormDto {
 
     private static final long serialVersionUID = 1L;
 
@@ -51,10 +53,10 @@ public class OrgDepartmentFormVo {
     @ApiModelProperty(value = "动态表单值")
     private List<FormValue> dynamicFormAlert;
 
-    public OrgDepartmentFormVo() {
+    public OrgDepartmentFormDto() {
     }
 
-    public OrgDepartmentFormVo(List<FormValue> dynamicFormAlert) {
+    public OrgDepartmentFormDto(List<FormValue> dynamicFormAlert) {
         this.dynamicFormAlert = dynamicFormAlert;
     }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgMenuVo.java → amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgMenuDto.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
+package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils;
 @Data
 @Accessors(chain = true)
 @ApiModel(value="OrgMenuVo", description="树菜单")
-public class OrgMenuVo {
+public class OrgMenuDto {
     private Long key;
     private Long value;
     private String title;
@@ -23,7 +23,7 @@ public class OrgMenuVo {
     private Long parentId;
     private Boolean leaf = true;
     private Boolean isLeaf = true;
-    private List<OrgMenuVo> children;
+    private List<OrgMenuDto> children;
     private String bizOrgType;
     private String bizOrgCode;
     
@@ -43,7 +43,7 @@ public class OrgMenuVo {
     	return title;
     }
     
-    public OrgMenuVo(Long key, String title, Long parentId, String bizOrgType, boolean leaf, String bizOrgCode) {
+    public OrgMenuDto(Long key, String title, Long parentId, String bizOrgType, boolean leaf, String bizOrgCode) {
         super();
         this.key = key;
         this.title = title;
@@ -53,7 +53,7 @@ public class OrgMenuVo {
         this.bizOrgCode = bizOrgCode;
     }
     
-    public OrgMenuVo(Long key, String title, Long parentId, String bizOrgType, boolean leaf) {
+    public OrgMenuDto(Long key, String title, Long parentId, String bizOrgType, boolean leaf) {
         super();
         this.key = key;
         this.title = title;
@@ -62,7 +62,7 @@ public class OrgMenuVo {
         this.leaf = leaf;
     }
 
-    public OrgMenuVo(Long key, String title, Long parentId, String bizOrgType) {
+    public OrgMenuDto(Long key, String title, Long parentId, String bizOrgType) {
         this.key = key;
         this.title = title;
         this.parentId = parentId;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgPersonDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -72,4 +76,7 @@ public class OrgPersonDto extends BaseDto {
     @TableField(fill= FieldFill.INSERT_UPDATE)
     private String recUserName;
     
+    @ApiModelProperty(value = "动态表单值")
+    private List<AlertFormValue> alertFormValue;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgPersonFormVo.java → amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgPersonFormDto.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
+package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +21,7 @@ import java.util.List;
 @Accessors(chain = true)
 @TableName("cb_org_usr")
 @ApiModel(value="OrgUsrVo", description="人员信息")
-public class OrgPersonFormVo extends BaseEntity{
+public class OrgPersonFormDto extends BaseEntity{
 
     private static final long serialVersionUID = 1L;
 
@@ -54,10 +56,10 @@ public class OrgPersonFormVo extends BaseEntity{
     @ApiModelProperty(value = "动态表单值")
     private List<FormValue> dynamicFormAlert;
 
-    public OrgPersonFormVo() {
+    public OrgPersonFormDto() {
     }
 
-    public OrgPersonFormVo(List<FormValue> dynamicFormAlert) {
+    public OrgPersonFormDto(List<FormValue> dynamicFormAlert) {
         this.dynamicFormAlert = dynamicFormAlert;
     }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgUsrDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -69,4 +73,6 @@ public class OrgUsrDto extends BaseDto {
     @TableField(fill= FieldFill.INSERT_UPDATE)
     private String recUserName;
 
+    @ApiModelProperty(value = "动态表单值")
+    private List<AlertFormValue> alertFormValue;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgUsrFormVo.java → amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgUsrFormDto.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
+package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +21,7 @@ import java.util.List;
 @Accessors(chain = true)
 @TableName("cb_org_usr")
 @ApiModel(value="OrgUsrVo", description="机构/部门/人员表")
-public class OrgUsrFormVo implements Serializable {
+public class OrgUsrFormDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -61,8 +63,8 @@ public class OrgUsrFormVo implements Serializable {
     private List<FormValue> dynamicFormAlert;
 
     @ApiModelProperty(value = "单位人员信息值")
-    private List<OrgPersonFormVo> children;
+    private List<OrgPersonFormDto> children;
 
-    public OrgUsrFormVo() {
+    public OrgUsrFormDto() {
     }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IOrgUsrService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.api.vo.*;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentFormDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgPersonDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgPersonFormDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrFormDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
+
 
 
 /**
@@ -38,7 +45,7 @@ public interface IOrgUsrService {
 	 * @return
 	 * @throws Exception
 	 */
-	List<OrgMenuVo> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
+	List<OrgMenuDto> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
 							String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
 
 	/**
@@ -54,7 +61,7 @@ public interface IOrgUsrService {
 	 * @return
 	 * @throws Exception
 	 */
-	List<OrgMenuVo> getSub(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
+	List<OrgMenuDto> getSub(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
 			String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
 
 	/**
@@ -103,35 +110,35 @@ public interface IOrgUsrService {
 
 	List<OrgUsr> selectCompanyDepartmentMsg();
 
-	void saveOrgUsr( OrgUsrVo OrgUsrVo) throws Exception;
+	void saveOrgUsr( OrgUsrDto OrgUsrDto) throws Exception;
 
-	void saveOrgPerson( OrgPersonVo OrgPersonVo) throws Exception;
+	void saveOrgPerson( OrgPersonDto OrgPersonDto) throws Exception;
 
-	void updateByIdOrgUsr(OrgUsrVo OrgUsrVo,Long id) throws Exception;
+	void updateByIdOrgUsr(OrgUsrDto OrgUsrDto,Long id) throws Exception;
 
-	void updateByIdOrgPerson(OrgPersonVo OrgPersonVo,Long id) throws Exception;
+	void updateByIdOrgPerson(OrgPersonDto OrgPersonDto,Long id) throws Exception;
 
-	OrgUsrFormVo selectCompanyById(Long id) throws Exception;
+	OrgUsrFormDto selectCompanyById(Long id) throws Exception;
 
 	IPage bizOrgTypeListPage(String pageNum, String pageSize, String bizOrgType) throws Exception;
 
-	void saveDepartment(List<OrgDepartmentVo> OrgDepartmentVo, Long id)throws Exception;
+	void saveDepartment(List<OrgDepartmentDto> OrgDepartmentDto, Long id)throws Exception;
 
-	void saveCompany(List<OrgUsrVo> OrgUsrVo)throws Exception;
+	void saveCompany(List<OrgUsrDto> OrgUsrDto)throws Exception;
 
-	OrgPersonFormVo selectPersonById(Long id) throws Exception;
+	OrgPersonFormDto selectPersonById(Long id) throws Exception;
 
-	OrgPersonFormVo selectPersonByIdDetail(Long id) throws Exception;
+	OrgPersonFormDto selectPersonByIdDetail(Long id) throws Exception;
 
-	List<OrgMenuVo> selectPersonTree() throws Exception;
+	List<OrgMenuDto> selectPersonTree() throws Exception;
 
-	void savePersonList (List <OrgPersonVo> OrgPersonVo)throws Exception;
+	void savePersonList (List <OrgPersonDto> OrgPersonDto)throws Exception;
 
-	void saveOrgDepartment(OrgDepartmentVo OrgDepartmentVo) throws Exception;
+	void saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
 
-	void updateByIdOrgDepartment ( OrgDepartmentVo OrgDepartmentVo,Long id) throws Exception;
+	void updateByIdOrgDepartment ( OrgDepartmentDto OrgDepartmentDto,Long id) throws Exception;
 
-	OrgDepartmentFormVo selectDepartmentById(Long id) throws Exception;
+	OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception;
 
 	List<Map<String, Object>>  selectForShowByListId(List<Long> ids) throws Exception;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgDepartmentVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
-* 机构/部门/人员表
-*
-* @author tb
-* @date 2021-06-18
-*/
-@Data
-@Accessors(chain = true)
-@TableName("cb_org_usr")
-@ApiModel(value="OrgUsrVo", description="部门信息")
-public class OrgDepartmentVo {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "机构/部门名称")
-    private String bizOrgName;
-
-    @ApiModelProperty(value = "机构编码")
-    private String bizOrgCode;
-
-    @ApiModelProperty(value = "amos中公司/部门ID")
-    private String amosOrgId;
-
-    @ApiModelProperty(value = "amos中公司/部门编码")
-    private String amosOrgCode;
-
-    @ApiModelProperty(value = "机构类型`")
-    private String bizOrgType;
-
-    @ApiModelProperty(value = "所属建筑名称")
-    private String buildName;
-
-    @ApiModelProperty(value = "所属建筑ID")
-    private String buildId;
-
-    @ApiModelProperty(value = "归属机构/部门/人员")
-    private String parentId;
-
-    @ApiModelProperty(value = "动态表单值")
-    private List<AlertFormValue> alertFormValue;
-
-    public OrgDepartmentVo(String bizOrgName, String parentId, String buildName, List<AlertFormValue> alertFormValue) {
-        this.bizOrgName = bizOrgName;
-        this.parentId = parentId;
-        this.buildName = buildName;
-        this.alertFormValue = alertFormValue;
-    }
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgPersonVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
-* 机构/部门/人员表
-*
-* @author tb
-* @date 2021-06-18
-*/
-@Data
-@Accessors(chain = true)
-@ApiModel(value="OrgUsrVo", description="人员")
-public class OrgPersonVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "机构/部门名称")
-    private String bizOrgName;
-
-    @ApiModelProperty(value = "机构编码")
-    private String bizOrgCode;
-
-    @ApiModelProperty(value = "amos中公司/部门ID")
-    private String amosOrgId;
-
-    @ApiModelProperty(value = "amos中公司/部门编码")
-    private String amosOrgCode;
-
-    @ApiModelProperty(value = "机构类型`")
-    private String bizOrgType;
-
-    @ApiModelProperty(value = "所属建筑名称")
-    private String buildName;
-
-    @ApiModelProperty(value = "所属建筑ID")
-    private String buildId;
-
-    @ApiModelProperty(value = "归属机构/部门/人员")
-    private String parentId;
-
-    @ApiModelProperty(value = "动态表单值")
-    private List<AlertFormValue> alertFormValue;
-
-    public OrgPersonVo() {
-    }
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgUsrAuthVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.experimental.Accessors;
-/**
-* 
-*
-* @author tb
-* @date 2021-06-18
-*/
-@Data
-@Accessors(chain = true)
-@TableName("cb_org_usr_auth")
-@ApiModel(value="OrgUsrAuthVo", description="")
-public class OrgUsrAuthVo{
-
-    private static final long serialVersionUID = 1L;
-
-
-    private String recUserName;
-
-    private String sourceId;
-
-    private String sourceCode;
-
-    private String targetCode;
-
-    private String targetId;
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgUsrDownloadTemplateVO.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @author fengwang
- * @date 2021-06-21.
- */
-@Data
-@Accessors(chain = true)
-@TableName("cb_org_usr")
-@ApiModel(value="OrgUsrDownloadTemplateVO", description="")
-@ExcelTarget("OrgUsrDownloadTemplateVO")
-public class OrgUsrDownloadTemplateVO {
-
-    @Excel(name = "机构名称",width = 30)
-    @ApiModelProperty(value = "机构/部门名称")
-    private String bizOrgName;
-
-    @Excel(name = "机构编码",width = 30)
-    @ApiModelProperty(value = "机构编码")
-    private String bizOrgCode;
-
-    @Excel(name = "amos中公司/部门ID",width = 30)
-    @ApiModelProperty(value = "amos中公司/部门ID")
-    private String amosOrgId;
-
-    @Excel(name = "amos中公司/部门ID",width = 30)
-    @ApiModelProperty(value = "amos中公司/部门编码")
-    private String amosOrgCode;
-
-    @Excel(name = "amos中公司/部门ID",width = 30)
-    @ApiModelProperty(value = "机构类型（单位：COMPANY）")
-    private String bizOrgType = CommonConstant.BIZ_ORG_TYPE_COMPANY;
-
-    @Excel(name = "amos中公司/部门ID",width = 30)
-    @ApiModelProperty(value = "所属建筑名称")
-    private String buildName;
-
-    @Excel(name = "amos中公司/部门ID",width = 30)
-    @ApiModelProperty(value = "所属建筑ID")
-    private String buildId;
-
-    @Excel(name = "amos中公司/部门ID",width = 30)
-    @ApiModelProperty(value = "归属机构/部门/人员")
-    private String parentId;
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgUsrVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * 机构/部门/人员表
- *
- * @author tb
- * @date 2021-06-18
- */
-@Data
-@Accessors(chain = true)
-@TableName("cb_org_usr")
-@ApiModel(value = "OrgUsrVo", description = "单位信息")
-public class OrgUsrVo {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "机构/部门名称")
-    private String bizOrgName;
-
-    @ApiModelProperty(value = "机构编码")
-    private String bizOrgCode;
-
-    @ApiModelProperty(value = "amos中公司/部门ID")
-    private String amosOrgId;
-
-    @ApiModelProperty(value = "amos中公司/部门编码")
-    private String amosOrgCode;
-
-    @ApiModelProperty(value = "机构类型`")
-    private String bizOrgType;
-
-    @ApiModelProperty(value = "所属建筑名称")
-    private String buildName;
-
-    @ApiModelProperty(value = "所属建筑ID")
-    private String buildId;
-
-    @ApiModelProperty(value = "归属机构/部门/人员")
-    private String parentId;
-
-    @ApiModelProperty(value = "单位动态表单值")
-    private List<AlertFormValue> alertFormValue;
-
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgDepartmentController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.text.SimpleDateFormat;
 import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentFormVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -29,11 +21,10 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-import com.yeejoin.amos.boot.biz.common.utils.ExcelUtils;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentFormDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrDownloadTemplateVO;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.OrgUsrServiceImpl;
 
@@ -61,7 +52,7 @@ public class OrgDepartmentController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增部门信息", notes = "新增部门信息")
-    public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentVo OrgDepartmentVo) throws Exception {
+    public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentDto OrgDepartmentVo) throws Exception {
     	OrgDepartmentVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
     	iOrgUsrService.saveOrgDepartment(OrgDepartmentVo);
         return ResponseHelper.buildResponse(null);
@@ -91,7 +82,7 @@ public class OrgDepartmentController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "更新部门数据", notes = "更新部门数据")
-    public ResponseModel<Object> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentVo OrgDepartmentVo, @PathVariable Long id) throws Exception {
+    public ResponseModel<Object> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentDto OrgDepartmentVo, @PathVariable Long id) throws Exception {
     	OrgDepartmentVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
     	iOrgUsrService.updateByIdOrgDepartment(OrgDepartmentVo, id);
         return ResponseHelper.buildResponse(null);
@@ -107,7 +98,7 @@ public class OrgDepartmentController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取部门详情", notes = "获取部门详情")
-    public ResponseModel<OrgDepartmentFormVo> selectById(HttpServletRequest request, @PathVariable Long id) throws Exception {
+    public ResponseModel<OrgDepartmentFormDto> selectById(HttpServletRequest request, @PathVariable Long id) throws Exception {
         return ResponseHelper.buildResponse(iOrgUsrService.selectDepartmentById(id));
     }
 
@@ -157,20 +148,4 @@ public class OrgDepartmentController {
         page = iOrgUsrService.page(pageBean, orgUsrQueryWrapper);
         return page;
     }
-
-    /**
-     * 导出部门模板
-     *
-     * @param response
-     * @param OrgUsrDownloadTemplateVO
-     * @return
-     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "download-template", method = RequestMethod.POST)
-    @ApiOperation(httpMethod = "POST", value = "导出模板", notes = "导出模板")
-    public ResponseModel downloadTemplate(HttpServletResponse response, @RequestBody List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO) throws UnsupportedEncodingException {
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
-        ExcelUtils.exportExcel(OrgUsrDownloadTemplateVO, "部门信息", "部门信息", OrgUsrDownloadTemplateVO.class, simpleDateFormat.format(new Date()) + ".xls", response);
-        return ResponseHelper.buildResponse(null);
-    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgPersonController.java

@@ -26,9 +26,8 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.utils.ExcelUtils;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgPersonDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgPersonVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrDownloadTemplateVO;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.OrgUsrServiceImpl;
 
@@ -56,7 +55,7 @@ public class OrgPersonController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
-	public ResponseModel saveOrgUsr(HttpServletRequest request, @RequestBody OrgPersonVo OrgPersonVo) throws Exception {
+	public ResponseModel saveOrgUsr(HttpServletRequest request, @RequestBody OrgPersonDto OrgPersonVo) throws Exception {
 		OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
 		iOrgUsrService.saveOrgPerson(OrgPersonVo);
 		return ResponseHelper.buildResponse(null);
@@ -85,7 +84,7 @@ public class OrgPersonController {
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/{id}", method = RequestMethod.PUT)
 	@ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
-	public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgPersonVo OrgPersonVo, @PathVariable Long id) throws Exception {
+	public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgPersonDto OrgPersonVo, @PathVariable Long id) throws Exception {
 		OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
 		iOrgUsrService.updateByIdOrgPerson(OrgPersonVo,id);
 		return ResponseHelper.buildResponse(null);
@@ -191,8 +190,8 @@ public class OrgPersonController {
 	@ApiOperation(httpMethod = "GET", value = "导出人员模板", notes = "导出人员模板")
     public ResponseModel downloadTemplate(HttpServletResponse response) throws UnsupportedEncodingException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
-        List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO = new ArrayList<OrgUsrDownloadTemplateVO>();
-        ExcelUtils.exportExcel(OrgUsrDownloadTemplateVO, "人员信息", "人员信息", OrgUsrDownloadTemplateVO.class, simpleDateFormat.format(new Date()) + ".xls", response);
+//        List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO = new ArrayList<OrgUsrDownloadTemplateVO>();
+//        ExcelUtils.exportExcel(OrgUsrDownloadTemplateVO, "人员信息", "人员信息", OrgUsrDownloadTemplateVO.class, simpleDateFormat.format(new Date()) + ".xls", response);
         return ResponseHelper.buildResponse(null);
 	}
 
@@ -204,7 +203,7 @@ public class OrgPersonController {
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/savePerson", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "导入人员信息", notes = "导入人员信息")
-	public ResponseModel savePerson(HttpServletRequest request, @RequestBody List<OrgPersonVo> OrgPersonVo) throws Exception {
+	public ResponseModel savePerson(HttpServletRequest request, @RequestBody List<OrgPersonDto> OrgPersonVo) throws Exception {
 		iOrgUsrService.savePersonList(OrgPersonVo);
 		return ResponseHelper.buildResponse(null);
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgUsrController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
 
-import java.io.UnsupportedEncodingException;
-import java.text.SimpleDateFormat;
 import java.util.Arrays;
-import java.util.Date;
-
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgMenuVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -23,20 +17,21 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.ExcelUtils;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrDownloadTemplateVO;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrVo;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.OrgUsrServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -65,7 +60,7 @@ public class  OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增单位信息", notes = "新增单位信息")
-    public ResponseModel saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrVo OrgUsrVo) throws Exception {
+    public ResponseModel saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo) throws Exception {
     	OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
     	iOrgUsrService.saveOrgUsr(OrgUsrVo);
         return ResponseHelper.buildResponse(null);
@@ -95,7 +90,7 @@ public class  OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
-    public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsrVo OrgUsrVo, @PathVariable Long id) throws Exception {
+    public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo, @PathVariable Long id) throws Exception {
     	OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
     	iOrgUsrService.updateByIdOrgUsr(OrgUsrVo,id);
         return ResponseHelper.buildResponse(null);
@@ -139,8 +134,8 @@ public class  OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyTree", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取单位部门树(key为物理主键)", notes = "获取单位部门树(key为物理主键)\"")
-    public ResponseModel< List<OrgMenuVo>>selectCompanyTree() throws Exception {
-        List<OrgMenuVo> menus = iOrgUsrService.getTree(null, iOrgUsrService.selectCompanyDepartmentMsg(), OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
+    public ResponseModel< List<OrgMenuDto>>selectCompanyTree() throws Exception {
+        List<OrgMenuDto> menus = iOrgUsrService.getTree(null, iOrgUsrService.selectCompanyDepartmentMsg(), OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
         return ResponseHelper.buildResponse(menus);
     }
     
@@ -153,8 +148,8 @@ public class  OrgUsrController extends BaseController {
    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
    @RequestMapping(value = "/orgTree", method = RequestMethod.GET)
    @ApiOperation(httpMethod = "GET", value = "获取单位部门树(bizOrgCode为物理主键)", notes = "获取单位部门树(bizOrgCode为物理主键)\"")
-   public ResponseModel< List<OrgMenuVo>>selectCompanyTreeCode() throws Exception {
-       List<OrgMenuVo> menus = iOrgUsrService.buildTreeParallel(iOrgUsrService.selectCompanyDepartmentMsg());
+   public ResponseModel< List<OrgMenuDto>>selectCompanyTreeCode() throws Exception {
+       List<OrgMenuDto> menus = iOrgUsrService.buildTreeParallel(iOrgUsrService.selectCompanyDepartmentMsg());
        return ResponseHelper.buildResponse(menus);
    }
 
@@ -214,7 +209,7 @@ public class  OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/saveDepartment", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "导入部门信息", notes = "导入部门信息")
-    public ResponseModel saveDepartment(HttpServletRequest request, @RequestBody List<OrgDepartmentVo> OrgDepartmentVo, @PathVariable Long id) throws Exception {
+    public ResponseModel saveDepartment(HttpServletRequest request, @RequestBody List<OrgDepartmentDto> OrgDepartmentVo, @PathVariable Long id) throws Exception {
         iOrgUsrService.saveDepartment(OrgDepartmentVo,id);
         return ResponseHelper.buildResponse(null);
     }
@@ -227,7 +222,7 @@ public class  OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/saveCompany", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "导入单位信息", notes = "导入单位信息")
-    public ResponseModel saveCompany(HttpServletRequest request, @RequestBody List<OrgUsrVo> OrgUsrVo) throws Exception {
+    public ResponseModel saveCompany(HttpServletRequest request, @RequestBody List<OrgUsrDto> OrgUsrVo) throws Exception {
        iOrgUsrService.saveCompany(OrgUsrVo);
        return ResponseHelper.buildResponse(null);
     }
@@ -244,20 +239,4 @@ public class  OrgUsrController extends BaseController {
     public ResponseModel selectUsersByOrgCode(HttpServletRequest request, @PathVariable List<Long> ids) throws Exception {
         return ResponseHelper.buildResponse(iOrgUsrService.returnCompanyPersonMsg(ids)) ;
     }
-
-    /**
-     * 导出单位模板
-     *
-     * @param response
-     * @param OrgUsrDownloadTemplateVO
-     * @return
-     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "download-template", method = RequestMethod.POST)
-    @ApiOperation(httpMethod = "POST", value = "导出模板", notes = "导出模板")
-    public ResponseModel downloadTemplate(HttpServletResponse response, @RequestBody List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO) throws UnsupportedEncodingException {
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
-        ExcelUtils.exportExcel(OrgUsrDownloadTemplateVO, "单位信息", "单位信息", OrgUsrDownloadTemplateVO.class, simpleDateFormat.format(new Date()) + ".xls", response);
-        return ResponseHelper.buildResponse(null);
-    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrgUsrServiceImpl.java

@@ -26,7 +26,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromValueDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentFormDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgPersonDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgPersonFormDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrFormDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
@@ -35,13 +41,6 @@ import com.yeejoin.amos.boot.module.jcs.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormValueVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentFormVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgMenuVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgPersonFormVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgPersonVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrFormVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrVo;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
@@ -65,23 +64,23 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
     
     
-    public static List<OrgMenuVo> buildTreeParallel(List<OrgUsr> list) {
+    public static List<OrgMenuDto> buildTreeParallel(List<OrgUsr> list) {
 
-        List<OrgMenuVo> menuList = list.stream().map(o -> {
-        	OrgMenuVo menu = new OrgMenuVo(o.getSequenceNbr(), o.getBizOrgName(), ObjectUtils.isEmpty(o.getParentId()) ? 0L :Long.valueOf(o.getParentId()), o.getBizOrgType(), false, o.getBizOrgCode());
+        List<OrgMenuDto> menuList = list.stream().map(o -> {
+        	OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(), ObjectUtils.isEmpty(o.getParentId()) ? 0L :Long.valueOf(o.getParentId()), o.getBizOrgType(), false, o.getBizOrgCode());
         	return menu;
         }).collect(Collectors.toList());
         
-        List<OrgMenuVo> result = new ArrayList<>();
-        Map<Long, OrgMenuVo> map = new HashMap<>(menuList.size());
+        List<OrgMenuDto> result = new ArrayList<>();
+        Map<Long, OrgMenuDto> map = new HashMap<>(menuList.size());
         menuList.forEach(e -> map.put(e.getKey(), e));
-        Set<? extends Map.Entry<Long, ? extends OrgMenuVo>> entries = map.entrySet();
+        Set<? extends Map.Entry<Long, ? extends OrgMenuDto>> entries = map.entrySet();
         entries.parallelStream().forEach(entry -> {
-        	OrgMenuVo value = entry.getValue();
+        	OrgMenuDto value = entry.getValue();
             if (value != null) {
-            	OrgMenuVo treeDto = map.get(value.getParentId());
+            	OrgMenuDto treeDto = map.get(value.getParentId());
                 if (treeDto != null) {
-                    List<OrgMenuVo> children = treeDto.getChildren();
+                    List<OrgMenuDto> children = treeDto.getChildren();
                     if (children == null) {
                         children = new ArrayList<>();
                         treeDto.setChildren(children);
@@ -96,8 +95,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public List<OrgMenuVo> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception {
-        List<OrgMenuVo> resultList = new ArrayList<>();
+    public List<OrgMenuDto> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception {
+        List<OrgMenuDto> resultList = new ArrayList<>();
         Class<?> clazz = Class.forName(packageURL);
         Method IDMethodNameme = null;
         switch (IDHierarchy) {
@@ -127,12 +126,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             parentId = PARENTIDMethodNameme.invoke(entity) != null ? Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity))) : null;
 
             if (parentId == null || topId == parentId) {
-                OrgMenuVo menu = new OrgMenuVo(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, String.valueOf(OrgTypeMethodNameme.invoke(entity)), false);
+                OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, String.valueOf(OrgTypeMethodNameme.invoke(entity)), false);
                 resultList.add(menu);
             }
         }
         //获取每个顶层元素的子数据集合
-        for (OrgMenuVo entity : resultList) {
+        for (OrgMenuDto entity : resultList) {
             entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName, IDHierarchy, NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName));
         }
         return resultList;
@@ -140,8 +139,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
     @SuppressWarnings("unchecked")
     @Override
-    public List<OrgMenuVo> getSub(Long topId, @SuppressWarnings("rawtypes") Collection entityList, String packageURL, String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception {
-        List<OrgMenuVo> childList = new ArrayList<>();
+    public List<OrgMenuDto> getSub(Long topId, @SuppressWarnings("rawtypes") Collection entityList, String packageURL, String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception {
+        List<OrgMenuDto> childList = new ArrayList<>();
         @SuppressWarnings("rawtypes")
         Class clazz = Class.forName(packageURL);
         Method IDMethodNameme = null;
@@ -172,12 +171,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
             if (parentId == null) {
                 if (topId == parentId) {
-                    OrgMenuVo menu = new OrgMenuVo(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, String.valueOf(OrgTypeMethodNameme.invoke(entity)));
+                    OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, String.valueOf(OrgTypeMethodNameme.invoke(entity)));
                     childList.add(menu);
                 }
             } else {
                 if (topId.longValue() == parentId.longValue()) {
-                    OrgMenuVo menu = new OrgMenuVo(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, String.valueOf(OrgTypeMethodNameme.invoke(entity)));
+                    OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, String.valueOf(OrgTypeMethodNameme.invoke(entity)));
                     childList.add(menu);
                 }
             }
@@ -185,7 +184,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         }
 
         //子集的间接子对象
-        for (OrgMenuVo entity : childList) {
+        for (OrgMenuDto entity : childList) {
             entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName, IDHierarchy, NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName));
             if (entity.getChildren() != null) {
                 entity.setLeaf(false);
@@ -496,7 +495,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public void saveOrgUsr(OrgUsrVo OrgUsrVo) throws Exception {
+    public void saveOrgUsr(OrgUsrDto OrgUsrVo) throws Exception {
         OrgUsr orgUsr = new OrgUsr();
         BeanUtils.copyProperties(OrgUsrVo, orgUsr);
         orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
@@ -512,7 +511,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public void saveOrgPerson(OrgPersonVo OrgPersonVo) throws Exception {
+    public void saveOrgPerson(OrgPersonDto OrgPersonVo) throws Exception {
         OrgUsr orgUsr = new OrgUsr();
         BeanUtils.copyProperties(OrgPersonVo, orgUsr);
         orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
@@ -535,7 +534,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public void updateByIdOrgUsr(OrgUsrVo OrgUsrVo, Long id) throws Exception {
+    public void updateByIdOrgUsr(OrgUsrDto OrgUsrVo, Long id) throws Exception {
         // 修改单位信息
         OrgUsr orgUsr = new OrgUsr();
         OrgUsr oriOrgUsr = getById(id);
@@ -554,7 +553,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public void updateByIdOrgPerson(OrgPersonVo OrgPersonVo, Long id) throws Exception {
+    public void updateByIdOrgPerson(OrgPersonDto OrgPersonVo, Long id) throws Exception {
         // 修改人员信息
         OrgUsr orgUsr = new OrgUsr();
         OrgUsr oriOrgUsr = getById(id);
@@ -573,11 +572,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public OrgUsrFormVo selectCompanyById(Long id) throws Exception {
+    public OrgUsrFormDto selectCompanyById(Long id) throws Exception {
         OrgUsr orgUsr = getById(id);
         // 动态表单数据
         List<FormValue> formValue = getFormValue(id);
-        OrgUsrFormVo orgUsrFormVo = new OrgUsrFormVo();
+        OrgUsrFormDto orgUsrFormVo = new OrgUsrFormDto();
         orgUsrFormVo.setDynamicFormAlert(formValue);
         BeanUtils.copyProperties(orgUsr, orgUsrFormVo);
         return orgUsrFormVo;
@@ -602,7 +601,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public void saveDepartment(List<OrgDepartmentVo> OrgDepartmentVo, Long id) throws Exception {
+    public void saveDepartment(List<OrgDepartmentDto> OrgDepartmentVo, Long id) throws Exception {
         for (int i = 0; i < OrgDepartmentVo.size(); i++) {
             // 导入部门信息的前提条件：单位信息已经存在
             if (getById(id) != null) {
@@ -615,7 +614,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public void saveCompany(List<OrgUsrVo> OrgUsrVo) throws Exception {
+    public void saveCompany(List<OrgUsrDto> OrgUsrVo) throws Exception {
         for (int i = 0; i < OrgUsrVo.size(); i++) {
             OrgUsr orgUsr = new OrgUsr();
             BeanUtils.copyProperties(OrgUsrVo.get(i), orgUsr);
@@ -625,11 +624,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public OrgPersonFormVo selectPersonById(Long id) throws Exception {
+    public OrgPersonFormDto selectPersonById(Long id) throws Exception {
         OrgUsr orgUsr = getById(id);
         // 动态表单数据
         List<FormValue> formValue = getFormValue(id);
-        OrgPersonFormVo orgPersonFormVo = new OrgPersonFormVo(formValue);
+        OrgPersonFormDto orgPersonFormVo = new OrgPersonFormDto(formValue);
         BeanUtils.copyProperties(orgUsr, orgPersonFormVo);
         OrgUsr parent = getById(orgUsr.getParentId());
         if (!ObjectUtils.isEmpty(parent)) {
@@ -640,11 +639,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public OrgPersonFormVo selectPersonByIdDetail(Long id) throws Exception {
+    public OrgPersonFormDto selectPersonByIdDetail(Long id) throws Exception {
         OrgUsr orgUsr = getById(id);
         // 动态表单数据
         List<FormValue> formValue = getFormValueDetail(id);
-        OrgPersonFormVo orgPersonFormVo = new OrgPersonFormVo(formValue);
+        OrgPersonFormDto orgPersonFormVo = new OrgPersonFormDto(formValue);
         BeanUtils.copyProperties(orgUsr, orgPersonFormVo);
         orgPersonFormVo.setParentName(getById(orgUsr.getParentId()).getBizOrgName());
         return orgPersonFormVo;
@@ -652,7 +651,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 
     @Override
-    public List<OrgMenuVo> selectPersonTree() throws Exception {
+    public List<OrgMenuDto> selectPersonTree() throws Exception {
         Map<String, Object> columnMap = new HashMap<>();
         columnMap.put("is_delete", CommonConstant.IS_DELETE_00);
         columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
@@ -662,7 +661,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 
     @Override
-    public void savePersonList(List<OrgPersonVo> OrgPersonVo) throws Exception {
+    public void savePersonList(List<OrgPersonDto> OrgPersonVo) throws Exception {
         for (int i = 0; i < OrgPersonVo.size(); i++) {
             OrgUsr orgUsr = new OrgUsr();
             BeanUtils.copyProperties(OrgPersonVo.get(i), orgUsr);
@@ -672,7 +671,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public void saveOrgDepartment(OrgDepartmentVo OrgDepartmentVo) throws Exception {
+    public void saveOrgDepartment(OrgDepartmentDto OrgDepartmentVo) throws Exception {
         OrgUsr orgUsr = new OrgUsr();
         BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
         orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
@@ -688,7 +687,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public void updateByIdOrgDepartment(OrgDepartmentVo OrgDepartmentVo, Long id) throws Exception {
+    public void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentVo, Long id) throws Exception {
         // 修改部门信息
         OrgUsr orgUsr = new OrgUsr();
         OrgUsr oriOrgUsr = getById(id);
@@ -707,11 +706,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public OrgDepartmentFormVo selectDepartmentById(Long id) throws Exception {
+    public OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception {
         OrgUsr orgUsr = getById(id);
         // 动态表单数据
         List<FormValue> formValue = getFormValue(id);
-        OrgDepartmentFormVo orgDepartmentFormVo = new OrgDepartmentFormVo(formValue);
+        OrgDepartmentFormDto orgDepartmentFormVo = new OrgDepartmentFormDto(formValue);
         BeanUtils.copyProperties(orgUsr, orgDepartmentFormVo);
         return orgDepartmentFormVo;
     }