zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-08 04:39:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

✨ Introducing new features. 支持 vue3 代码生成

Browse Source
This commit is contained in:
lbw committed 2023-02-06 16:34:12 +08:00
1 parent 203db7ab4a
commit 999d2f4d15
2 files changed
+50 -69
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/StyleTypeEnum.java
+5 -1
View File
@@ -33,7 +33,11 @@ public enum StyleTypeEnum {
/**
* magic
*/
MAGIC("3", "magic");
MAGIC("3", "magic"),
/**
* element-plus
*/
PLUS("4", "plus");
/**
* 类型
pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+45 -68
View File
@@ -48,86 +48,59 @@
</collection>
</resultMap>
<!-- userVo结果集 -->
<resultMap id="userVoResultMap" type="com.pig4cloud.pigx.admin.api.vo.UserVO">
<id column="user_id" property="userId"/>
<result column="username" property="username"/>
<result column="password" property="password"/>
<result column="salt" property="salt"/>
<result column="phone" property="phone"/>
<result column="avatar" property="avatar"/>
<result column="wx_openid" property="wxOpenid"/>
<result column="qq_openid" property="qqOpenid"/>
<result column="ucreate_time" property="createTime"/>
<result column="uupdate_time" property="updateTime"/>
<result column="lock_flag" property="lockFlag"/>
<result column="del_flag" property="delFlag"/>
<result column="dept_id" property="deptId"/>
<result column="tenant_id" property="tenantId"/>
<result column="dept_name" property="deptName"/>
<collection property="roleList" ofType="com.pig4cloud.pigx.admin.api.entity.SysRole">
<id column="role_id" property="roleId"/>
<result column="role_name" property="roleName"/>
<result column="role_code" property="roleCode"/>
<result column="role_desc" property="roleDesc"/>
<result column="rcreate_time" property="createTime"/>
<result column="rupdate_time" property="updateTime"/>
</collection>
</resultMap>
<sql id="userRoleSql">
u.user_id,
u.username,
u.password,
u.salt,
u.phone,
u.avatar,
u.wx_openid,
u.qq_openid,
u.dept_id,
u.del_flag,
u.lock_flag,
u.tenant_id,
u.username,
u.password,
u.salt,
u.phone,
u.avatar,
u.wx_openid,
u.qq_openid,
u.dept_id,
u.del_flag,
u.lock_flag,
u.tenant_id,
u.create_by,
u.create_time ucreate_time,
u.update_time uupdate_time,
r.role_id,
r.role_name,
r.role_code,
r.role_desc,
r.create_time rcreate_time,
r.update_time rupdate_time
u.create_time ucreate_time,
u.update_time uupdate_time,
r.role_id,
r.role_name,
r.role_code,
r.role_desc,
r.create_time rcreate_time,
r.update_time rupdate_time
</sql>
<sql id="userRoleDeptSql">
u.user_id,
u.username,
u.password,
u.salt,
u.phone,
u.avatar,
u.wx_openid,
u.qq_openid,
u.del_flag,
u.lock_flag,
u.tenant_id,
u.username,
u.password,
u.salt,
u.phone,
u.avatar,
u.wx_openid,
u.qq_openid,
u.del_flag,
u.lock_flag,
u.tenant_id,
u.nickname,
u.name,
u.email,
u.create_by,
u.create_time ucreate_time,
u.update_time uupdate_time,
r.role_id,
r.role_name,
r.role_code,
r.role_desc,
r.create_time rcreate_time,
r.update_time rupdate_time,
d.name dept_name,
d.dept_id
u.create_time ucreate_time,
u.update_time uupdate_time,
r.role_id,
r.role_name,
r.role_code,
r.role_desc,
r.create_time rcreate_time,
r.update_time rupdate_time,
d.name dept_name,
d.dept_id
</sql>
<select id="getUserVoByUsername" resultMap="userVoResultMap">
<select id="getUserVoByUsername" resultMap="baseResultMap">
SELECT
<include refid="userRoleSql"/>
FROM
@@ -137,7 +110,7 @@
WHERE u.username = #{username}
</select>
<select id="getUserVoById" resultMap="userVoResultMap">
<select id="getUserVoById" resultMap="baseResultMap">
SELECT
<include refid="userRoleDeptSql"/>
FROM
@@ -182,6 +155,10 @@
<if test="query.deptId != null and query.deptId != ''">
AND u.dept_id = #{query.deptId}
</if>
<if test="query.phone != null and query.phone != ''">
<bind name="phoneLike" value="'%'+query.phone+'%'"/>
AND u.phone LIKE #{phoneLike}
</if>
</where>
<if test="_databaseId != 'mssql'">