fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/bo/CompanyDepartmentAddBo.java

@@ -22,9 +22,12 @@ public class CompanyDepartmentAddBo {
     /** 公司id */
     @ApiModelProperty("公司id")
     private Long companyId;
-    /** 部门名称 */
-    @ApiModelProperty("部门名称")
+    /** 部门名称简称 */
+    @ApiModelProperty("部门名称简称")
     private String departmentName;
+    /** 部门名称全称 */
+    @ApiModelProperty("部门名称全称")
+    private String departmentFullName;
     /** 部门类型 1：部门 2：子级 */
     @ApiModelProperty("部门类型 1：部门 2：子级")
     private Long departmentType;

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/bo/CompanyDepartmentEditBo.java

@@ -27,10 +27,14 @@ public class CompanyDepartmentEditBo {
     @ApiModelProperty("公司id")
     private Long companyId;
 
-    /** 部门名称 */
-    @ApiModelProperty("部门名称")
+    /** 部门名称简称 */
+    @ApiModelProperty("部门名称简称")
     private String departmentName;
 
+    /** 部门名称全称 */
+    @ApiModelProperty("部门名称全称")
+    private String departmentFullName;
+
     /** 部门类型 1：部门 2：子级 */
     @ApiModelProperty("部门类型 1：部门 2：子级")
     private Long departmentType;

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/bo/CompanyDepartmentQueryBo.java

@@ -40,9 +40,12 @@ public class CompanyDepartmentQueryBo extends BaseEntity {
 	/** 公司id */
 	@ApiModelProperty("公司id")
 	private Long companyId;
-	/** 部门名称 */
-	@ApiModelProperty("部门名称")
+	/** 部门名称简称 */
+	@ApiModelProperty("部门名称简称")
 	private String departmentName;
+	/** 部门名称全称 */
+	@ApiModelProperty("部门名称全称")
+	private String departmentFullName;
 	/** 部门类型 1：部门 2：子级 */
 	@ApiModelProperty("部门类型 1：部门 2：子级")
 	private Long departmentType;

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/domain/CompanyDepartment.java

@@ -28,8 +28,10 @@ private static final long serialVersionUID=1L;
     private String tenantId;
     /** 公司id */
     private Long companyId;
-    /** 部门名称 */
+    /** 部门名称简称 */
     private String departmentName;
+    /** 部门名称全称 */
+    private String departmentFullName;
     /** 部门类型 1：部门 2：子级 */
     private Long departmentType;
     /** 部门联系人 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/service/impl/CompanyDepartmentServiceImpl.java

@@ -41,6 +41,8 @@ public class CompanyDepartmentServiceImpl extends ServiceImpl<CompanyDepartmentM
     public List<CompanyDepartmentVo> queryList(CompanyDepartmentQueryBo bo) {
         LambdaQueryWrapper<CompanyDepartment> lqw = Wrappers.lambdaQuery();
         lqw.eq(ObjectUtil.isNotEmpty(bo.getCompanyId()), CompanyDepartment::getCompanyId, bo.getCompanyId());
+        lqw.eq(ObjectUtil.isNotEmpty(bo.getDepartmentName()), CompanyDepartment::getDepartmentName, bo.getDepartmentName());
+        lqw.eq(ObjectUtil.isNotEmpty(bo.getDepartmentFullName()), CompanyDepartment::getDepartmentFullName, bo.getDepartmentFullName());
         lqw.eq(StrUtil.isNotBlank(bo.getTenantId()), CompanyDepartment::getTenantId, bo.getTenantId());
         lqw.eq(bo.getDepartmentType() != null, CompanyDepartment::getDepartmentType, bo.getDepartmentType());
         lqw.eq(StrUtil.isNotBlank(bo.getRegisteredContacts()), CompanyDepartment::getRegisteredContacts, bo.getRegisteredContacts());

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/vo/CompanyDepartmentVo.java

@@ -31,9 +31,13 @@ public class CompanyDepartmentVo {
 	@ApiModelProperty("公司id")
 	private String companyId;
 	/** 部门名称 */
-	@Excel(name = "部门名称")
-	@ApiModelProperty("部门名称")
+	@Excel(name = "部门名称简称")
+	@ApiModelProperty("部门名称简称")
 	private String departmentName;
+	/** 部门名称 */
+	@Excel(name = "部门名称全称")
+	@ApiModelProperty("部门名称全称")
+	private String departmentFullName;
 	/** 部门类型 1：部门 2：子级 */
 	@Excel(name = "部门类型 1：部门 2：子级")
 	@ApiModelProperty("部门类型 1：部门 2：子级")

zhongzheng-system/src/main/resources/mapper/modules/company/CompanyDepartmentMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="tenantId" column="tenant_id"/>
         <result property="companyId" column="company_id"/>
         <result property="departmentName" column="department_name"/>
+        <result property="departmentFullName" column="department_full_name"/>
         <result property="departmentType" column="department_type"/>
         <result property="registeredContacts" column="registered_contacts"/>
         <result property="departmentPhone" column="department_phone"/>