add user interface

src/main/java/com/dragon/tj/portal/auth/controller/DeptController.java

@@ -1,5 +1,6 @@
 package com.dragon.tj.portal.auth.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dragon.tj.portal.auth.util.SecurityUtils;
 import com.dragon.tj.portal.auth.util.TreeBuilder;
@@ -24,6 +25,8 @@ import java.util.stream.Collectors;
 @RequestMapping("/dept")
 public class DeptController {
 
+    private static final String ROOT_ORG_CODE = "120000000000";
+
     @Autowired
     private SysDeptService sysDeptService;
 
@@ -44,8 +47,15 @@ public class DeptController {
     }
 
     @GetMapping("/tree")
-    public R<List<DeptTreeNode>> tree() {
-        String rootOrgCode = SecurityUtils.getLoginUser().getOrgCode();
+    public R<List<DeptTreeNode>> tree(@RequestParam(required = false) String upOrgCode, @RequestParam(required = false) boolean fromRoot) {
+        String rootOrgCode;
+        if(StringUtils.isNotBlank(upOrgCode)){
+            rootOrgCode = upOrgCode;
+        } else if (fromRoot) {
+            rootOrgCode = ROOT_ORG_CODE;
+        }else {
+            rootOrgCode = SecurityUtils.getLoginUser().getOrgCode();
+        }
 
         Pattern pattern = Pattern.compile("^(.*?)(00)*$");
         Matcher matcher = pattern.matcher(rootOrgCode);

src/main/java/com/dragon/tj/portal/auth/controller/UserController.java

@@ -1,9 +1,16 @@
 package com.dragon.tj.portal.auth.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dragon.tj.portal.auth.model.LoginUser;
 import com.dragon.tj.portal.auth.util.SecurityUtils;
+import com.dragon.tj.portal.auth.web.entity.SysUser;
+import com.dragon.tj.portal.auth.web.service.SysUserService;
 import com.dragon.tj.portal.common.base.R;
+import com.dragon.tj.portal.entity.PageParam;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -15,13 +22,23 @@ import java.util.Map;
 @RequestMapping("/user")
 public class UserController {
 
+    @Autowired
+    private SysUserService sysUserService;
+
     @GetMapping("/info")
     public R<Map<String, Object>> info(HttpServletRequest request) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         Map<String, Object> data = new HashMap<>(3);
-        data.put("name", loginUser.getUser().getName());
-        data.put("idCard", loginUser.getUser().getIdcard());
+        data.put("name", loginUser.getUsername());
+        data.put("deptCode", loginUser.getOrgCode());
+        data.put("deptName", loginUser.getUser().getOrgName());
+        data.put("idCard", loginUser.getIdCard());
         data.put("roles", loginUser.getPermissions());
         return R.ok(data);
     }
+
+    @PostMapping("/list")
+    public R<Page<SysUser>> list(@RequestBody PageParam<SysUser> pageParam) {
+        return R.ok(sysUserService.list(pageParam));
+    }
 }

src/main/java/com/dragon/tj/portal/auth/util/TreeBuilder.java

@@ -67,7 +67,7 @@ public class TreeBuilder {
         // nodeList：所有节点集合（所有数据）
         for (DeptTreeNode node : nodeList) {
             // 判断当前节点的父节点ID是否等于根节点的ID，即当前节点为其下的子节点
-            if (node.getUpOrgCode().equals(pNode.getOrgCode())) {
+            if (pNode.getOrgCode().equals(node.getUpOrgCode())) {
                 // 再递归进行判断当前节点的情况，调用自身方法
                 childTree.add(buildChildTree(node));
             }

src/main/java/com/dragon/tj/portal/auth/web/service/SysUserService.java

@@ -1,7 +1,9 @@
 package com.dragon.tj.portal.auth.web.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dragon.tj.portal.auth.web.entity.SysUser;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dragon.tj.portal.entity.PageParam;
 
 /**
  * <p>
@@ -14,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface SysUserService extends IService<SysUser> {
 
     SysUser getUserById(String idCard);
+
+    Page<SysUser> list(PageParam<SysUser> pageParam);
 }

src/main/java/com/dragon/tj/portal/auth/web/service/impl/SysUserServiceImpl.java

@@ -1,11 +1,16 @@
 package com.dragon.tj.portal.auth.web.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dragon.tj.portal.auth.client.DcucUserClient;
 import com.dragon.tj.portal.auth.model.RR;
 import com.dragon.tj.portal.auth.web.entity.SysUser;
 import com.dragon.tj.portal.auth.web.mapper.SysUserMapper;
 import com.dragon.tj.portal.auth.web.service.SysUserService;
+import com.dragon.tj.portal.entity.PageParam;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +48,23 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return sysUser;
     }
 
+    @Override
+    public Page<SysUser> list(PageParam<SysUser> pageParam) {
+        Page<SysUser> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        String order = pageParam.getOrder();
+        if (StringUtils.isNotBlank(order)) {
+            page.addOrder(OrderItem.asc(order));
+        }
+
+        SysUser sysUser = pageParam.getParams();
+        LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotEmpty(sysUser.getName()), SysUser::getName, sysUser.getName());
+        queryWrapper.like(StringUtils.isNotEmpty(sysUser.getPoliceNumber()), SysUser::getPoliceNumber, sysUser.getPoliceNumber());
+        queryWrapper.eq(sysUser.getOrgCode() != null, SysUser::getOrgCode, sysUser.getOrgCode());
+        queryWrapper.eq(SysUser::getDeleted, "0");
+        return baseMapper.selectPage(page, queryWrapper);
+    }
+
     public SysUser getUserFromDcuc(String idCard) {
         SysUser sysUser = null;
         try {