Merge branch 'dev_change_0814' into dev

# Conflicts:
#	web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java

web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java

@@ -37,6 +37,10 @@ public class CorpDepartmentQry extends PageQuery {
 
     @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "eqUseFlag")
     private String eqUseFlag;
+
+    @ApiModelProperty(value = "企业类型，0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位", name = "eqType")
+    private String eqType;
+
     @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType", required = true)
     private Integer enterpriseType;
 

web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentPageQry.java

@@ -27,10 +27,15 @@ public class DepartmentPageQry extends PageQuery {
      * - `ne`: 不等比较查询，对应SQL的!=操作符
      */
     /**
-     * 名称模糊查询
+     * 部门名称模糊查询
      */
-    @ApiModelProperty(value = "名称模糊查询", name = "likeName")
+    @ApiModelProperty(value = "部门名称模糊查询", name = "likeName")
     private String likeName;
+    /**
+     * 负责人名称模糊查询
+     */
+    @ApiModelProperty(value = "负责人名称模糊查询", name = "likeLeaderName")
+    private String likeLeaderName;
     @ApiModelProperty(value = "企业id", name = "eqCorpInfoId")
     private Long eqCorpinfoId;
     @ApiModelProperty(value = "父id", name = "eqParentId")

web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java

@@ -34,11 +34,11 @@ public class UserPageQry extends PageQuery {
     private Long[] inDepartmentId;
     @ApiModelProperty(value = "岗位id")
     private Long eqPostId;
-    @ApiModelProperty(value = "角色id")
+    @ApiModelProperty(value = "用户角色id（精确查询）", name = "eqRoleId")
     private Long eqRoleId;
     @ApiModelProperty(value = "入职状态，0-离职, 1-在职, 2-信息变更中, 3-未入职, 4-实习生, 5-实习结束, 6-退休, 7-劳务派遣, 8-劳务派遣结束, 11-入职待审核, 10-离职待审核")
     private Integer eqEmploymentFlag;
-    @ApiModelProperty(value = "姓名模糊搜索")
+    @ApiModelProperty(value = "姓名（模糊查询）", name = "likeName")
     private String likeName;
     @ApiModelProperty(value = "账号模糊搜索")
     private String likeUsername;

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java

@@ -23,6 +23,7 @@ import com.zcloud.basic.info.utils.Query;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
 import com.zcloud.gbscommon.utils.Tools;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -45,8 +46,17 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
     @Override
     public PageResponse<DepartmentDO> listPage(Map<String, Object> parmas) {
         IPage<DepartmentDO> iPage = new Query<DepartmentDO>().getPage(parmas);
+        Map<String, Object> queryParams = new HashMap<>(parmas);
+        String likeLeaderName = (String) queryParams.remove("likeLeaderName");
         QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
-        queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
+        queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, queryParams);
+        if (StringUtils.isNotBlank(likeLeaderName)) {
+            queryWrapper.apply("EXISTS (SELECT 1 FROM user u " +
+                    "WHERE u.department_id = department.id " +
+                    "AND u.delete_enum = 'FALSE' " +
+                    "AND u.department_leader_flag = '1' " +
+                    "AND u.name LIKE CONCAT('%', {0}, '%'))", likeLeaderName.trim());
+        }
         queryWrapper.orderByAsc("dep_order").orderByDesc("create_time");
         String menuPerms = "";
         if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))){