报销人员查询功能修改

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

@@ -406,6 +406,34 @@ public class UserController {
      * @return
      */
     @ApiLog("获取部门用户数据")
+    @GetMapping("treeUserDataAllOffice")
+    public ResponseEntity treeUserDataAllOffice(@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);
+        if(list.size()>0){
+            List<String> officeIds = Lists.newArrayList();
+            for (OfficeDTO info :
+                    list) {
+                info.setTypeFlag(true);
+                officeIds.add(info.getId());
+            }
+            //根据部门查询对应部门下的所有数据
+            List<OfficeDTO> officeDTOList = userService.getUserByOffice(officeIds,type);
+            list.addAll(officeDTOList);
+        }
+        List rootTree = officeService.getRootTree (list, extId, type, showAll);
+        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);

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

@@ -47,9 +47,11 @@
         <include refid="officeColumns"/>
     from sys_office a
         <where>
+        <if test="officeName != null and officeName != ''">
             a.id = (select id from sys_office where name = #{officeName})
             or
             a.parent_ids like concat('%',(select id from sys_office where name = #{officeName}),'%')
+        </if>
         </where>
     </select>
 </mapper>

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

@@ -182,6 +182,7 @@
 					#{officeId}
 				</foreach>
 			</if>
+			and a.is_admin IS NULL
 		</where>
 	</select>