查询人员信息部分功能修改

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -396,5 +396,29 @@ public class UserController {
         return ResponseEntity.ok (rootTree);
     }
 
+    /**
+     * 获取机构JSON数据。
+     *
+     * @param officeName 部门名称
+     * @param extId 排除的ID
+     * @param type  类型（1：公司；2：部门）
+     * @param showAll 是否显示不可用数据 1 显示 0 隐藏
+     * @return
+     */
+    @ApiLog("获取部门用户数据")
+    @GetMapping("treeUserDataByOfficeName")
+    public ResponseEntity treeUserDataByOfficeName(@RequestParam(required = false) String officeName,@RequestParam(required = false) String extId, @RequestParam(required = false) String type, @RequestParam(required = false, defaultValue = CommonConstants.NO) String showAll) {
+        List<OfficeDTO> list = officeService.getOfficeAllByOfficeName (officeName);
+        for (OfficeDTO info :
+                list) {
+            info.setTypeFlag(true);
+        }
+        //根据部门查询对应部门下的所有数据
+        List<OfficeDTO> officeDTOList = userService.disposeUserOffice(list,type);
+        list.addAll(officeDTOList);
+        List rootTree = officeService.getRootTree (list, extId, type, showAll);
+        return ResponseEntity.ok (rootTree);
+    }
+
 
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/OfficeMapper.java

@@ -5,8 +5,11 @@ package com.jeeplus.sys.mapper;
 
 import com.jeeplus.core.domain.TreeMapper;
 import com.jeeplus.sys.domain.Office;
+import com.jeeplus.sys.service.dto.OfficeDTO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 机构MAPPER接口
  *
@@ -17,4 +20,11 @@ public interface OfficeMapper extends TreeMapper<Office> {
 
     Office getOfficeByName(@Param("officeName") String officeName, @Param("parentName") String parentName);
 
+    /**
+     * 根据部门名称 查询部门及所有子部门信息
+     * @param officeName
+     * @return
+     */
+    List<OfficeDTO> getOfficeAllByOfficeName(@Param("officeName") String officeName);
+
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/xml/OfficeMapper.xml

@@ -8,9 +8,18 @@
         <where>
             name = #{officeName}
             <if test="null != parentName and '' != parentName">
-                and parent_id = (select id from sys_office where name = #{parentName} and del_flag = 0)
+                ${parentName}
             </if>
             and del_flag = 0
         </where>
     </select>
+
+    <select id="getOfficeAllByOfficeName" resultType="com.jeeplus.sys.service.dto.OfficeDTO">
+    select * from sys_office
+        <where>
+            id = (select id from sys_office where name = #{officeName})
+            or
+            parent_ids like concat('%',(select id from sys_office where name = #{officeName}),'%')
+        </where>
+    </select>
 </mapper>

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/OfficeService.java

@@ -120,10 +120,36 @@ public class OfficeService extends TreeService<OfficeMapper, Office> {
      * @return
      */
     public Office getOfficeByName(String officeName,String parentName){
-        Office office = mapper.getOfficeByName(officeName,parentName);
+        if(StringUtils.isBlank(parentName)){
+            parentName = "";
+        }
+        String parentIdArray[] =parentName.split(",");
+        StringBuilder parentSql = new StringBuilder();
+        for (int i = 0 ; i < parentIdArray.length; i++){
+            if(StringUtils.isNotBlank(parentIdArray[i])){
+                parentSql.append(" AND parent_id = (select id from sys_office where name = '").append(parentIdArray[i]).append("' AND del_flag = 0");
+            }
+        }
+        for (int i = 0 ; i < parentIdArray.length; i++){
+            if(StringUtils.isNotBlank(parentIdArray[i])){
+                parentSql.append(")");
+            }
+        }
+        Office office = mapper.getOfficeByName(officeName,parentSql.toString());
         return office;
     }
 
+    /**
+     * 根据部门名称查询部门信息
+     * @param officeName
+     * @return
+     */
+    public List<OfficeDTO> getOfficeAllByOfficeName(String officeName){
+        List<OfficeDTO> officeList = mapper.getOfficeAllByOfficeName(officeName);
+
+        return officeList;
+    }
+
 
 
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/dto/UserDTO.java

@@ -49,8 +49,6 @@ public class UserDTO extends BaseDTO {
      */
     @JsonIgnore
     @Length(min = 1, max = 100)
-    @Excel (name = "密码")
-    @Query
     private String password;