Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/controller/SysTokenController.java → src/main/java/com/huiju/estateagents/center/sysUser/controller/SysTokenController.java

@@ -1,12 +1,12 @@
-package com.huiju.estateagents.controller;
+package com.huiju.estateagents.center.sysUser.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.entity.SysToken;
-import com.huiju.estateagents.service.ISysTokenService;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/huiju/estateagents/controller/SysUserController.java → src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java

@@ -1,17 +1,28 @@
-package com.huiju.estateagents.controller;
+package com.huiju.estateagents.center.sysUser.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.entity.SysUser;
-import com.huiju.estateagents.service.ISysUserService;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import com.huiju.estateagents.center.sysUser.service.ISysUserService;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.MD5Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
     * 系统用户 系统中心账户 前端控制器
@@ -21,14 +32,16 @@ import org.springframework.web.bind.annotation.*;
  * @since 2019-09-11
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class SysUserController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(SysUserController.class);
 
     @Autowired
     public ISysUserService iSysUserService;
-
+    
+    @Autowired
+    private ISysTokenService sysTokenService;
 
     /**
      * 分页查询列表
@@ -102,15 +115,16 @@ public class SysUserController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
      * @param sysUser 实体对象
      * @return
      */
-    @RequestMapping(value="/sysUser/{id}",method= RequestMethod.PUT)
-    public ResponseBean sysUserUpdate(@PathVariable Integer id,
-                                        @RequestBody SysUser sysUser){
+    @RequestMapping(value="/center/sysUser",method= RequestMethod.PUT)
+    public ResponseBean sysUserUpdate(@RequestBody SysUser sysUser,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            String userName = JWTUtils.getSubject(request);
+            sysUser.setPassword(MD5Utils.md5(sysUser.getPassword()));
+            sysUser.setUserName(userName);
             if (iSysUserService.updateById(sysUser)){
                 responseBean.addSuccess(sysUser);
             }else {
@@ -140,4 +154,55 @@ public class SysUserController extends BaseController {
         }
         return responseBean;
     }
+    
+    @PostMapping("/center/signin")
+    public ResponseBean signin(@RequestBody String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (params == null) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        
+        String userName = params.getString("userName");
+        String userPassword = params.getString("password");
+        
+        //验证用户名密码是否正确
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("user_name",userName);
+        sysUserQueryWrapper.eq("password", MD5Utils.md5(userPassword));
+        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
+        if (sysUser == null) {
+            return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        
+        if (sysUser.getStatus() != CommConstant.STATUS_NORMAL) {
+            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        
+        String token = JWTUtils.newToken(sysUser.getUserName());
+    
+        //保存token
+        saveToken(token);
+        
+        Map<String, Object> result = new HashMap<>();
+        result.put("token", token);
+        result.put("user", sysUser);
+        
+        return ResponseBean.success(result);
+    }
+    
+    @PostMapping("/center/signout")
+    public ResponseBean signout(HttpServletRequest request) {
+        String token = JWTUtils.getToken(request);
+        QueryWrapper<SysToken> sysTokenQueryWrapper = new QueryWrapper<>();
+        sysTokenQueryWrapper.eq("token",token);
+        sysTokenService.remove(sysTokenQueryWrapper);
+        return ResponseBean.success("成功退出");
+    }
+    
+    private void saveToken(String token) {
+        SysToken sysToken = new SysToken();
+        sysToken.setToken(token);
+        sysToken.setExpDate(LocalDateTime.now());
+        sysTokenService.save(sysToken);
+    }
 }

src/main/java/com/huiju/estateagents/entity/SysToken.java → src/main/java/com/huiju/estateagents/center/sysUser/entity/SysToken.java

@@ -1,5 +1,6 @@
-package com.huiju.estateagents.entity;
+package com.huiju.estateagents.center.sysUser.entity;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,6 +26,7 @@ public class SysToken implements Serializable {
     /**
      * token
      */
+    @TableId(value = "token")
     private String token;
 
     /**

src/main/java/com/huiju/estateagents/entity/SysUser.java → src/main/java/com/huiju/estateagents/center/sysUser/entity/SysUser.java

@@ -1,5 +1,7 @@
-package com.huiju.estateagents.entity;
+package com.huiju.estateagents.center.sysUser.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -24,6 +26,7 @@ public class SysUser implements Serializable {
     /**
      * 账户登录
      */
+    @TableId(value = "user_name")
     private String userName;
 
     /**

src/main/java/com/huiju/estateagents/mapper/SysTokenMapper.java → src/main/java/com/huiju/estateagents/center/sysUser/mapper/SysTokenMapper.java

@@ -1,7 +1,7 @@
-package com.huiju.estateagents.mapper;
+package com.huiju.estateagents.center.sysUser.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huiju.estateagents.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/huiju/estateagents/mapper/SysUserMapper.java → src/main/java/com/huiju/estateagents/center/sysUser/mapper/SysUserMapper.java

@@ -1,7 +1,7 @@
-package com.huiju.estateagents.mapper;
+package com.huiju.estateagents.center.sysUser.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huiju.estateagents.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/huiju/estateagents/service/ISysTokenService.java → src/main/java/com/huiju/estateagents/center/sysUser/service/ISysTokenService.java

@@ -1,7 +1,7 @@
-package com.huiju.estateagents.service;
+package com.huiju.estateagents.center.sysUser.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
 
 /**
  * <p>

src/main/java/com/huiju/estateagents/service/ISysUserService.java → src/main/java/com/huiju/estateagents/center/sysUser/service/ISysUserService.java

@@ -1,7 +1,7 @@
-package com.huiju.estateagents.service;
+package com.huiju.estateagents.center.sysUser.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
 
 /**
  * <p>

src/main/java/com/huiju/estateagents/service/impl/SysTokenServiceImpl.java → src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysTokenServiceImpl.java

@@ -1,9 +1,10 @@
-package com.huiju.estateagents.service.impl;
+package com.huiju.estateagents.center.sysUser.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.entity.SysToken;
-import com.huiju.estateagents.mapper.SysTokenMapper;
-import com.huiju.estateagents.service.ISysTokenService;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.mapper.SysTokenMapper;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/huiju/estateagents/service/impl/SysUserServiceImpl.java → src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysUserServiceImpl.java

@@ -1,9 +1,10 @@
-package com.huiju.estateagents.service.impl;
+package com.huiju.estateagents.center.sysUser.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.entity.SysUser;
-import com.huiju.estateagents.mapper.SysUserMapper;
-import com.huiju.estateagents.service.ISysUserService;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.mapper.SysUserMapper;
+import com.huiju.estateagents.center.sysUser.service.ISysUserService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/huiju/estateagents/controller/TaUserController.java → src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -1,17 +1,20 @@
-package com.huiju.estateagents.controller;
+package com.huiju.estateagents.center.taUser.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.entity.TaUser;
-import com.huiju.estateagents.service.ITaUserService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.common.CommConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
+
 /**
  * <p>
     * 用户表  前端控制器
@@ -21,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2019-09-11
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaUserController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaUserController.class);
@@ -36,17 +39,14 @@ public class TaUserController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taUser",method= RequestMethod.GET)
+    @RequestMapping(value="/center/taUser",method= RequestMethod.GET)
     public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaUser> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaUser> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaUser> result = iTaUserService.page(pg, queryWrapper);
+		    IPage pg = new Page<>(pageNum, pageSize);
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/entity/TaUser.java → src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -1,4 +1,4 @@
-package com.huiju.estateagents.entity;
+package com.huiju.estateagents.center.taUser.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -79,6 +79,4 @@ public class TaUser implements Serializable {
      * 是否管理员
      */
     private Boolean isAdmin;
-
-
 }

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface TaUserMapper extends BaseMapper<TaUser> {
+	
+	List<Map<String,Object>> getPageList(IPage<TaUser> pg);
+}

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ITaUserService extends IService<TaUser> {
+	
+	IPage<Map<String,Object>> getPageList(IPage<TaUser> pg);
+}

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -0,0 +1,34 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> implements ITaUserService {
+	
+	@Autowired
+	private TaUserMapper taUserMapper;
+	
+	@Override
+	public IPage<Map<String,Object>> getPageList(IPage pg) {
+		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg);
+		pg.setRecords(taUserList);
+		return pg;
+	}
+}

src/main/java/com/huiju/estateagents/common/JWTUtils.java

@@ -1,13 +1,13 @@
 package com.huiju.estateagents.common;
 
 import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.security.Keys;
 
 import javax.servlet.http.HttpServletRequest;
 import java.security.Key;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Map;
 
 /**
  * JWTUtils
@@ -17,7 +17,7 @@ import java.util.Date;
 public class JWTUtils {
     // 直接定义常量是不安全的
     public final static Key key = Keys.hmacShaKeyFor("yansenisahero,2019-5-17 16:18:14".getBytes());
-
+    
     /**
      * getSubject 获取 jwt subject
      * @param request
@@ -38,6 +38,26 @@ public class JWTUtils {
 
         return null;
     }
+    
+    /**
+     * getSubject 获取 jwt subject
+     * @param request
+     * @return
+     */
+    public static String getToken(HttpServletRequest request) {
+        String jwtHeader = request.getHeader("authorization");
+        if (null == jwtHeader || "".equals(jwtHeader.trim())) {
+            return null;
+        }
+        
+        String[] jwtAuths = jwtHeader.split("Bearer ");
+        if (null == jwtAuths || jwtAuths.length < 2) {
+            return null;
+        }
+        
+        
+        return jwtAuths[1];
+    }
 
     /**
      * newToken 生成新的 token
@@ -49,7 +69,19 @@ public class JWTUtils {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());
         calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+7);
-
         return Jwts.builder().setSubject(subject).setExpiration(calendar.getTime()).signWith(key).compact();
     }
+    
+    /**
+     * newToken 生成新的 token
+     * @param subject
+     * @return
+     */
+    public static String newTokenByMap(Map subject) {
+        // 有效期 7 天
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+7);
+        return Jwts.builder().setClaims(subject).setExpiration(calendar.getTime()).signWith(key).compact();
+    }
 }

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -2,8 +2,11 @@ package com.huiju.estateagents.interceptor;
 
 import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.common.JWTUtils;
 import io.jsonwebtoken.*;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
@@ -13,12 +16,17 @@ import javax.servlet.http.HttpServletResponse;
 
 @Component
 public class AccessInterceptor implements HandlerInterceptor {
+    
+    @Autowired
+    private ISysTokenService sysTokenService;
+    
     private String[] whiteList = {
             "/wx/chat", // 聊天暂时不鉴权
             "/api/wx/login",
             "/api/admin/signin",
             "/api/taCheckin/activity",
-            "/api/wx/qrcode/scene"
+            "/api/wx/qrcode/scene",
+		    "/api/center/signin",
     };
 
     /*
@@ -91,7 +99,17 @@ public class AccessInterceptor implements HandlerInterceptor {
             response.getOutputStream().write(JSONObject.toJSONBytes(resp));
             return false;
         }
-
+        
+        //添加如果执行了登出操作提示先进行登录
+        SysToken sysToken = sysTokenService.getById(jwtAuths[1]);
+        if (null == sysToken){
+            ResponseBean resp = ResponseBean.error("请先进行系统登录操作", ResponseBean.ERROR_AUTH_FAIL);
+    
+            response.addHeader("Content-type", "application/json");
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+            return false;
+        }
+        
         return true;
     }
 

src/main/java/com/huiju/estateagents/mapper/TaUserMapper.java

@@ -1,18 +0,0 @@
-package com.huiju.estateagents.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huiju.estateagents.entity.TaUser;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 用户表  Mapper 接口
- * </p>
- *
- * @author jobob
- * @since 2019-09-11
- */
-@Mapper
-public interface TaUserMapper extends BaseMapper<TaUser> {
-
-}

src/main/java/com/huiju/estateagents/service/ITaUserService.java

@@ -1,16 +0,0 @@
-package com.huiju.estateagents.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.entity.TaUser;
-
-/**
- * <p>
- * 用户表  服务类
- * </p>
- *
- * @author jobob
- * @since 2019-09-11
- */
-public interface ITaUserService extends IService<TaUser> {
-
-}

src/main/java/com/huiju/estateagents/service/impl/TaUserServiceImpl.java

@@ -1,20 +0,0 @@
-package com.huiju.estateagents.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.entity.TaUser;
-import com.huiju.estateagents.mapper.TaUserMapper;
-import com.huiju.estateagents.service.ITaUserService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 用户表  服务实现类
- * </p>
- *
- * @author jobob
- * @since 2019-09-11
- */
-@Service
-public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> implements ITaUserService {
-
-}

src/main/resources/mapper/SysTokenMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huiju.estateagents.mapper.SysTokenMapper">
+<mapper namespace="com.huiju.estateagents.center.sysUser.mapper.SysTokenMapper">
 
 </mapper>

src/main/resources/mapper/SysUserMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huiju.estateagents.mapper.SysUserMapper">
+<mapper namespace="com.huiju.estateagents.center.sysUser.mapper.SysUserMapper">
 
 </mapper>

src/main/resources/mapper/TaUserMapper.xml

@@ -1,5 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huiju.estateagents.mapper.TaUserMapper">
+<mapper namespace="com.huiju.estateagents.center.taUser.mapper.TaUserMapper">
 
+    <select id="getPageList" resultType="map">
+        SELECT
+            t.user_id AS userId,
+            t.org_id AS orgId,
+            t.user_name AS userName,
+            t.login_name AS loginName,
+            t.phone,
+            t.avatar,
+            t.create_date AS createDate,
+            o.NAME AS orgName,
+            o.address,
+            o.logo,
+            o.remark,
+            m.miniapp_id AS miniappId,
+            m.secret,
+            m.token,
+            m.NAME AS miniaooName,
+            m.qr_code AS qrCode
+        FROM
+            ta_user t
+            LEFT JOIN ta_org o ON t.org_id = o.org_id
+            LEFT JOIN ta_miniapp m ON o.org_id = m.org_id
+        WHERE
+            t.is_admin =1
+    </select>
 </mapper>