LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

name to real name

Browse Source
This commit is contained in:
MaxKey
2022-07-04 09:12:58 +08:00
parent 8bfdaa33c0
commit 451af2dbac
82 changed files with 1376 additions and 1459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySystemLogsService.java
View File

@@ -114,9 +114,9 @@ public class HistorySystemLogsService extends JpaBaseService<HistorySystemLogs>
public String buildMsg(Organizations org) {
return new StringBuilder()
.append(org.getName())
.append(org.getOrgName())
.append("[")
.append(org.getCode())
.append(org.getOrgCode())
.append("]")
.toString();
}
@@ -143,7 +143,7 @@ public class HistorySystemLogsService extends JpaBaseService<HistorySystemLogs>
public String buildMsg(Roles g) {
return new StringBuilder()
.append(g.getName())
.append(g.getRoleName())
.toString();
}
@@ -178,7 +178,7 @@ public class HistorySystemLogsService extends JpaBaseService<HistorySystemLogs>
public String buildMsg(Resources r) {
return new StringBuilder()
.append(r.getName())
.append(r.getResourceName())
.append("[")
.append(r.getResourceType())
.append("]")

4
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsStrategyMapper.xml
View File

@@ -9,8 +9,8 @@
<if test="appId != null and appId != ''">
and mas.appid = #{appId}
</if>
<if test="name != null and name != ''">
and mas.name = #{name}
<if test="appName != null and appName != ''">
and mas.appname = #{appName}
</if>
</sql>

14
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml
View File

@@ -6,8 +6,8 @@
<if test="id != null and id != ''">
and id = #{id}
</if>
<if test="name != null and name != ''">
and name like '%${name}%'
<if test="appName != null and appName != ''">
and appname like '%${appName}%'
</if>
<if test="protocol != null and protocol != ''">
and protocol = #{protocol}
@@ -39,7 +39,7 @@
<insert id="insertApp" parameterType="Apps">
insert into mxk_apps(
id,
name,
appname,
icon,
loginurl,
protocol,
@@ -82,7 +82,7 @@
instid
)values(
#{id},
#{name},
#{appName},
#{icon},
#{loginUrl},
#{protocol},
@@ -127,7 +127,7 @@
<update id="updateApp" parameterType="Apps" >
update mxk_apps set
name = #{name},
appname = #{appName},
<if test="icon != null">
icon = #{icon},
</if>
@@ -200,8 +200,8 @@
</if>
)
)
<if test="name != null and name != ''">
and name = #{name}
<if test="appName != null and appName != ''">
and appname = #{appName}
</if>
order by sortindex
</select>

8
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml
View File

@@ -6,8 +6,8 @@
<if test="id != null and id != ''">
and id = #{id}
</if>
<if test="name != null and name != '' ">
and name like '%${name}%'
<if test="orgName != null and orgName != '' ">
and orgname like '%${orgName}%'
</if>
<if test="parentId != null and parentId != '' ">
and parentid = #{parentId}
@@ -45,8 +45,8 @@
<if test="id != null and id != '' ">
and id = #{id}
</if>
<if test="name != name">
and name = #{name}
<if test="orgName != orgName">
and orgname = #{orgName}
</if>
<if test="enable != null">
and status = '1'

10
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml
View File

@@ -12,8 +12,8 @@
<if test="parentId != null and parentId != ''">
and res.parentid = #{parentId}
</if>
<if test="name != null and name != ''">
and res.name like '%${name}%'
<if test="resourceName != null and resourceName != ''">
and res.resourcename like '%${resourceName}%'
</if>
</sql>
@@ -21,7 +21,7 @@
<select id="queryPageResults" parameterType="Resources" resultType="Resources">
select
res.*,app.name appname
res.*,app.appname
from
mxk_resources res, mxk_apps app
where
@@ -40,8 +40,8 @@
<if test="id != null">
and id = #{id}
</if>
<if test="name != name">
and name = #{name}
<if test="resourceName != resourceName">
and resourcename = #{resourceName}
</if>
</update>

10
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml
View File

@@ -15,7 +15,7 @@
select distinct
rm.id as id,
r.id as roleid,
r.name as rolename,
r.rolename,
r.dynamic dynamic,
u.username,
u.usertype,
@@ -61,7 +61,7 @@
and r.id = #{roleId}
</if>
<if test="roleName != null and roleName != ''">
and g.name = #{roleName}
and r.rolename = #{roleName}
</if>
<if test="username != null and username != ''">
and u.username = #{username}
@@ -126,7 +126,7 @@
and r.id = #{roleId}
</if>
<if test="roleName != null and roleName != ''">
and g.name = #{roleName}
and r.rolename = #{roleName}
</if>
and rm.type in( 'USER','USER-DYNAMIC')
and rm.roleid = r.id
@@ -158,7 +158,7 @@
</if>
)
<if test="roleName != null and roleName != ''">
and r.name = #{roleName}
and r.rolename = #{roleName}
</if>
</select>
@@ -180,7 +180,7 @@
and r.id = #{roleId}
</if>
<if test="roleName != null and roleName != ''">
and r.name = #{roleName}
and r.rolename = #{roleName}
</if>
</select>

9
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RolePermissionsMapper.xml
View File

@@ -6,8 +6,8 @@
<if test="id != null and id != ''">
and apps.id = #{id}
</if>
<if test="name != null and name != ''">
and apps.name like '%${name}%'
<if test="appName != null and appName != ''">
and apps.appname like '%${appName}%'
</if>
<if test="protocol != null and protocol != ''">
and apps.protocol = #{protocol}
@@ -22,10 +22,9 @@
select
p.id,
p.roleid,
r.name rolename,
r.rolename,
apps.id appid,
apps.name,
apps.name appname,
apps.appname,
apps.icon,
apps.loginurl,
apps.protocol,

8
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RolesMapper.xml
View File

@@ -6,8 +6,8 @@
<if test="id != null and id != ''">
and id = #{id}
</if>
<if test="name != null and name != ''">
and name like '%${name}%'
<if test="roleName != null and roleName != ''">
and rolename like '%${roleName}%'
</if>
</sql>
@@ -40,8 +40,8 @@
<if test="id != null">
and id = #{id}
</if>
<if test="name != name">
and name = #{name}
<if test="roleName != roleName">
and rolename = #{roleName}
</if>
</update>