Merge branch 'system-zyj' into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysUserController.java

@@ -60,6 +60,18 @@ public class SysUserController extends BaseController
         return ApiResult.success(getDataTable(list));
     }
 
+    /**
+     * 获取平台账号列表
+     */
+//    @Log(title = "用户列表", businessType = BusinessType.SELECT)
+    @GetMapping("/platAccountlist")
+    public ApiResult<TableDataInfo> platAccountlist(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.platAccountlist(user);
+        return ApiResult.success(getDataTable(list));
+    }
+
     /**
      * 获取用户列表
      */

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysUserService.java

@@ -23,6 +23,9 @@ public interface ISysUserService extends CrudService<SysUser> {
      */
     public List<SysUser> selectUserList(SysUser user);
 
+
+    List<SysUser> platAccountlist(SysUser user);
+
     /**
      * 根据条件分页查询用户列表
      *

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -78,6 +78,12 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         return userMapper.selectUserList(user);
     }
 
+    @Override
+    public List<SysUser> platAccountlist(SysUser user) {
+
+        return userMapper.selectUserList(user);
+    }
+
     /**
      * 根据条件分页查询用户列表
      *

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="com.usky.system.domain.SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex,
 		u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
 		from sys_user_tenant ut
 		left join sys_user u on ut.user_id = u.user_id