Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liqin
chnmuseum-party
Commits
9776428d
Commit
9776428d
authored
Mar 31, 2021
by
wzp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
7846edaa
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
162 additions
and
99 deletions
+162
-99
Audit.java
src/main/java/cn/wisenergy/chnmuseum/party/model/Audit.java
+17
-9
Menu.java
src/main/java/cn/wisenergy/chnmuseum/party/model/Menu.java
+74
-21
AuditController.java
...nergy/chnmuseum/party/web/controller/AuditController.java
+15
-7
ChinaMobileRestApiController.java
...um/party/web/controller/ChinaMobileRestApiController.java
+6
-2
MenuController.java
...energy/chnmuseum/party/web/controller/MenuController.java
+40
-40
TBoxOperationController.java
...nmuseum/party/web/controller/TBoxOperationController.java
+1
-11
AuditMapper.xml
src/main/resources/mapper/AuditMapper.xml
+6
-6
MenuMapper.xml
src/main/resources/mapper/MenuMapper.xml
+3
-3
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/model/Audit.java
View file @
9776428d
...
@@ -56,7 +56,7 @@ public class Audit implements Serializable {
...
@@ -56,7 +56,7 @@ public class Audit implements Serializable {
@NotBlank
(
message
=
"提交人员不能为空"
,
groups
=
{
Add
.
class
})
@NotBlank
(
message
=
"提交人员不能为空"
,
groups
=
{
Add
.
class
})
private
String
userId
;
private
String
userId
;
@ApiModelProperty
(
value
=
"审核内容"
,
allowableValues
=
"
视频内容 ASSET, 展板内容 EXHIBITION_BOARD, 学习内容 LEARNING_CONTENT, 账户
ACCOUNT"
)
@ApiModelProperty
(
value
=
"审核内容"
,
allowableValues
=
"
ASSET,EXHIBITION_BOARD,LEARNING_CONTENT,
ACCOUNT"
)
@TableField
(
"type"
)
@TableField
(
"type"
)
@NotBlank
(
message
=
"0,看板;1 视频;2 学习内容;3 账号禁用不能为空"
,
groups
=
{
Add
.
class
})
@NotBlank
(
message
=
"0,看板;1 视频;2 学习内容;3 账号禁用不能为空"
,
groups
=
{
Add
.
class
})
private
String
type
;
private
String
type
;
...
@@ -65,7 +65,7 @@ public class Audit implements Serializable {
...
@@ -65,7 +65,7 @@ public class Audit implements Serializable {
@TableField
(
"operation"
)
@TableField
(
"operation"
)
private
String
operation
;
private
String
operation
;
@ApiModelProperty
(
value
=
"审核状态"
,
allowableValues
=
"
待初审 TBC, 驳回 REFUSED,待复审 TBCA, 通过
APPROVED_FINAL"
)
@ApiModelProperty
(
value
=
"审核状态"
,
allowableValues
=
"
TBC,REFUSED,TBCA,
APPROVED_FINAL"
)
@TableField
(
"status"
)
@TableField
(
"status"
)
private
String
status
;
private
String
status
;
...
@@ -74,19 +74,27 @@ public class Audit implements Serializable {
...
@@ -74,19 +74,27 @@ public class Audit implements Serializable {
@NotNull
(
message
=
"创建日期不能为空"
,
groups
=
{
Add
.
class
})
@NotNull
(
message
=
"创建日期不能为空"
,
groups
=
{
Add
.
class
})
private
LocalDateTime
createTime
;
private
LocalDateTime
createTime
;
@ApiModelProperty
(
"更新日期"
)
@ApiModelProperty
(
"初审日期"
)
@TableField
(
value
=
"update_time"
,
fill
=
FieldFill
.
INSERT_UPDATE
)
@TableField
(
value
=
"first_time"
,
fill
=
FieldFill
.
INSERT_UPDATE
)
private
LocalDateTime
updateTime
;
private
LocalDateTime
firstTime
;
@ApiModelProperty
(
"复审日期"
)
@TableField
(
value
=
"second_time"
,
fill
=
FieldFill
.
INSERT_UPDATE
)
private
LocalDateTime
secondTime
;
@ApiModelProperty
(
"0:未删除,1:已删除"
)
@ApiModelProperty
(
"0:未删除,1:已删除"
)
@TableField
(
"is_deleted"
)
@TableField
(
"is_deleted"
)
private
Boolean
isDeleted
;
private
Boolean
isDeleted
;
@ApiModelProperty
(
"备注"
)
@ApiModelProperty
(
"初审意见"
)
@TableField
(
"remarks"
)
@TableField
(
"first_remarks"
)
private
String
remarks
;
private
String
firstRemarks
;
@ApiModelProperty
(
"复审意见"
)
@TableField
(
"second_remarks"
)
private
String
secondRemarks
;
@ApiModelProperty
(
value
=
"审核层级"
,
allowableValues
=
"
初审 TBC,复审
TBCA"
)
@ApiModelProperty
(
value
=
"审核层级"
,
allowableValues
=
"
TBC,
TBCA"
)
@TableField
(
"level"
)
@TableField
(
"level"
)
private
String
level
;
private
String
level
;
...
...
src/main/java/cn/wisenergy/chnmuseum/party/model/Menu.java
View file @
9776428d
...
@@ -48,14 +48,14 @@ public class Menu extends Model<Menu> {
...
@@ -48,14 +48,14 @@ public class Menu extends Model<Menu> {
* 菜单地址
* 菜单地址
*/
*/
@ApiModelProperty
(
value
=
"菜单地址"
)
@ApiModelProperty
(
value
=
"菜单地址"
)
@TableField
(
"
menu_
url"
)
@TableField
(
"url"
)
private
String
menuU
rl
;
private
String
u
rl
;
/**
/**
* 菜单名称
* 菜单名称
*/
*/
@ApiModelProperty
(
value
=
"菜单名称"
)
@ApiModelProperty
(
value
=
"菜单名称"
)
@TableField
(
"
menu_
name"
)
@TableField
(
"name"
)
private
String
menuN
ame
;
private
String
n
ame
;
/**
/**
* 上级菜单ID
* 上级菜单ID
*/
*/
...
@@ -81,6 +81,27 @@ public class Menu extends Model<Menu> {
...
@@ -81,6 +81,27 @@ public class Menu extends Model<Menu> {
@ApiModelProperty
(
value
=
"级别"
)
@ApiModelProperty
(
value
=
"级别"
)
private
Integer
level
;
private
Integer
level
;
/**
* 图标
*/
@TableField
(
"icon"
)
@ApiModelProperty
(
value
=
"图标"
)
private
String
icon
;
/**
* 页面风格
*/
@TableField
(
"color"
)
@ApiModelProperty
(
value
=
"页面风格"
)
private
String
color
;
/**
* 头像
*/
@TableField
(
"avatar"
)
@ApiModelProperty
(
value
=
"头像"
)
private
String
avatar
;
/**
/**
* 下级
* 下级
*/
*/
...
@@ -121,20 +142,20 @@ public class Menu extends Model<Menu> {
...
@@ -121,20 +142,20 @@ public class Menu extends Model<Menu> {
this
.
isDeleted
=
isDeleted
;
this
.
isDeleted
=
isDeleted
;
}
}
public
String
get
Menu
Url
()
{
public
String
getUrl
()
{
return
menuU
rl
;
return
u
rl
;
}
}
public
void
set
MenuUrl
(
String
menuU
rl
)
{
public
void
set
Url
(
String
u
rl
)
{
this
.
menuUrl
=
menuU
rl
;
this
.
url
=
u
rl
;
}
}
public
String
get
Menu
Name
()
{
public
String
getName
()
{
return
menuN
ame
;
return
n
ame
;
}
}
public
void
set
MenuName
(
String
menuN
ame
)
{
public
void
set
Name
(
String
n
ame
)
{
this
.
menuName
=
menuN
ame
;
this
.
name
=
n
ame
;
}
}
public
String
getParentId
()
{
public
String
getParentId
()
{
...
@@ -177,22 +198,54 @@ public class Menu extends Model<Menu> {
...
@@ -177,22 +198,54 @@ public class Menu extends Model<Menu> {
this
.
children
=
children
;
this
.
children
=
children
;
}
}
@Override
public
String
getIcon
()
{
protected
Serializable
pkVal
()
{
return
icon
;
return
this
.
id
;
}
public
void
setIcon
(
String
icon
)
{
this
.
icon
=
icon
;
}
public
String
getColor
()
{
return
color
;
}
public
void
setColor
(
String
color
)
{
this
.
color
=
color
;
}
public
String
getAvatar
()
{
return
avatar
;
}
public
void
setAvatar
(
String
avatar
)
{
this
.
avatar
=
avatar
;
}
}
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"Menu{"
+
return
"Menu{"
+
"
, id="
+
id
+
"
id='"
+
id
+
'\''
+
", createTime="
+
createTime
+
", createTime="
+
createTime
+
", updateTime="
+
updateTime
+
", updateTime="
+
updateTime
+
", isDeleted="
+
isDeleted
+
", isDeleted="
+
isDeleted
+
", menuUrl="
+
menuUrl
+
", url='"
+
url
+
'\''
+
", menuName="
+
menuName
+
", name='"
+
name
+
'\''
+
", parentId="
+
parentId
+
", parentId='"
+
parentId
+
'\''
+
", is button="
+
isButton
+
", isButton="
+
isButton
+
"}"
;
", sort="
+
sort
+
", level="
+
level
+
", icon='"
+
icon
+
'\''
+
", color='"
+
color
+
'\''
+
", avatar='"
+
avatar
+
'\''
+
", children="
+
children
+
'}'
;
}
}
@Override
protected
Serializable
pkVal
()
{
return
this
.
id
;
}
}
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AuditController.java
View file @
9776428d
...
@@ -24,6 +24,7 @@ import org.springframework.validation.annotation.Validated;
...
@@ -24,6 +24,7 @@ import org.springframework.validation.annotation.Validated;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
java.time.LocalDateTime
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -56,13 +57,12 @@ public class AuditController extends BaseController {
...
@@ -56,13 +57,12 @@ public class AuditController extends BaseController {
@ApiImplicitParam
(
name
=
"_size"
,
value
=
"返回条数"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"_size"
,
value
=
"返回条数"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"name"
,
value
=
"账号名称或提交人"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"name"
,
value
=
"账号名称或提交人"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"name"
,
value
=
"账号名称或提交人"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"name"
,
value
=
"账号名称或提交人"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"status"
,
value
=
"
待初审 TBC, 驳回 REFUSED,待复审 TBCA, 通过
APPROVED_FINAL"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"status"
,
value
=
"
TBC,REFUSED,TBCA,
APPROVED_FINAL"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"level"
,
value
=
"
初审 TBC,复审
TBCA"
,
paramType
=
"query"
,
dataType
=
"String"
)
@ApiImplicitParam
(
name
=
"level"
,
value
=
"
TBC,
TBCA"
,
paramType
=
"query"
,
dataType
=
"String"
)
})
})
public
Map
<
String
,
Object
>
getUserList
(
String
name
,
String
status
,
String
level
)
{
public
Map
<
String
,
Object
>
getUserList
(
String
name
,
String
status
,
String
level
)
{
Page
<
Audit
>
auditList
;
Page
<
Audit
>
auditList
;
try
{
try
{
TUser
user1
=
getcurUser
();
TUser
user
=
new
TUser
();
TUser
user
=
new
TUser
();
if
(
StringUtils
.
isNotBlank
(
name
))
{
if
(
StringUtils
.
isNotBlank
(
name
))
{
user
.
setUserName
(
name
);
user
.
setUserName
(
name
);
...
@@ -73,7 +73,6 @@ public class AuditController extends BaseController {
...
@@ -73,7 +73,6 @@ public class AuditController extends BaseController {
if
(
StringUtils
.
isNotBlank
(
level
))
{
if
(
StringUtils
.
isNotBlank
(
level
))
{
user
.
setAuditStatus
(
level
);
user
.
setAuditStatus
(
level
);
}
}
user
.
setOrgCode
(
user1
.
getOrgCode
());
auditList
=
auditService
.
getUserList
(
getPage
(),
user
);
auditList
=
auditService
.
getUserList
(
getPage
(),
user
);
return
getResult
(
auditList
);
return
getResult
(
auditList
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
@@ -87,11 +86,20 @@ public class AuditController extends BaseController {
...
@@ -87,11 +86,20 @@ public class AuditController extends BaseController {
@ApiOperation
(
value
=
"修改禁用审核信息"
,
notes
=
"修改禁用审核信息"
)
@ApiOperation
(
value
=
"修改禁用审核信息"
,
notes
=
"修改禁用审核信息"
)
public
Map
<
String
,
Object
>
updateAudit
(
@Validated
(
value
=
{
Update
.
class
})
Audit
audit
)
{
public
Map
<
String
,
Object
>
updateAudit
(
@Validated
(
value
=
{
Update
.
class
})
Audit
audit
)
{
boolean
flag
;
boolean
flag
;
if
(
!
AuditStatusEnum
.
TBCA
.
name
().
equals
(
audit
.
getStatus
()))
{
if
(
AuditStatusEnum
.
APPROVED_FINAL
.
name
().
equals
(
audit
.
getStatus
())&&
AuditStatusEnum
.
TBC
.
name
().
equals
(
audit
.
getLevel
()))
{
audit
.
setLevel
(
AuditStatusEnum
.
TBCA
.
name
());
audit
.
setLevel
(
AuditStatusEnum
.
TBCA
.
name
());
audit
.
setStatus
(
AuditStatusEnum
.
TBCA
.
name
());
}
}
if
(
AuditStatusEnum
.
TBC
.
name
().
equals
(
audit
.
getLevel
()))
{
audit
.
setFirstTime
(
LocalDateTime
.
now
());
if
(!
AuditStatusEnum
.
REFUSED
.
name
().
equals
(
audit
.
getStatus
()))
{
if
(!
AuditStatusEnum
.
REFUSED
.
name
().
equals
(
audit
.
getStatus
()))
{
audit
.
setRemarks
(
""
);
audit
.
setFirstRemarks
(
""
);
}
}
else
{
audit
.
setSecondTime
(
LocalDateTime
.
now
());
if
(!
AuditStatusEnum
.
REFUSED
.
name
().
equals
(
audit
.
getStatus
()))
{
audit
.
setFirstRemarks
(
""
);
}
}
}
try
{
try
{
if
(
AuditTypeEnum
.
ACCOUNT
.
name
().
equals
(
audit
.
getType
()))
{
if
(
AuditTypeEnum
.
ACCOUNT
.
name
().
equals
(
audit
.
getType
()))
{
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
View file @
9776428d
...
@@ -67,6 +67,9 @@ public class ChinaMobileRestApiController extends BaseController {
...
@@ -67,6 +67,9 @@ public class ChinaMobileRestApiController extends BaseController {
@Resource
@Resource
private
TUserServiceImpl
userService
;
private
TUserServiceImpl
userService
;
@Resource
private
TOrganServiceImpl
organService
;
@Resource
@Resource
private
RunLogServiceImpl
runLogService
;
private
RunLogServiceImpl
runLogService
;
...
@@ -239,6 +242,7 @@ public class ChinaMobileRestApiController extends BaseController {
...
@@ -239,6 +242,7 @@ public class ChinaMobileRestApiController extends BaseController {
JSONObject
resultMap
=
new
JSONObject
(
true
);
JSONObject
resultMap
=
new
JSONObject
(
true
);
try
{
try
{
TUser
user
=
userService
.
getById
(
userId
);
TUser
user
=
userService
.
getById
(
userId
);
TOrgan
organ
=
organService
.
getById
(
user
.
getOrgId
());
if
(
null
==
user
)
{
if
(
null
==
user
)
{
resultMap
.
put
(
"resultCode"
,
500
);
resultMap
.
put
(
"resultCode"
,
500
);
...
@@ -255,7 +259,7 @@ public class ChinaMobileRestApiController extends BaseController {
...
@@ -255,7 +259,7 @@ public class ChinaMobileRestApiController extends BaseController {
jsonObject
.
put
(
"effectiveDate"
,
user
.
getEffectiveDate
());
jsonObject
.
put
(
"effectiveDate"
,
user
.
getEffectiveDate
());
jsonObject
.
put
(
"expireDate"
,
user
.
getExiredDate
());
jsonObject
.
put
(
"expireDate"
,
user
.
getExiredDate
());
jsonObject
.
put
(
"orgCode"
,
user
.
getOrgId
());
jsonObject
.
put
(
"orgCode"
,
user
.
getOrgId
());
jsonObject
.
put
(
"orgName"
,
user
.
getOrg
Name
());
jsonObject
.
put
(
"orgName"
,
organ
.
get
Name
());
resultMap
.
put
(
"resultCode"
,
200
);
resultMap
.
put
(
"resultCode"
,
200
);
resultMap
.
put
(
"message"
,
"成功"
);
resultMap
.
put
(
"message"
,
"成功"
);
...
@@ -292,7 +296,7 @@ public class ChinaMobileRestApiController extends BaseController {
...
@@ -292,7 +296,7 @@ public class ChinaMobileRestApiController extends BaseController {
* 插入机顶盒日志表
* 插入机顶盒日志表
*/
*/
@ApiOperation
(
value
=
"插入机顶盒日志表"
,
notes
=
"插入机顶盒日志表"
)
@ApiOperation
(
value
=
"插入机顶盒日志表"
,
notes
=
"插入机顶盒日志表"
)
@PostMapping
(
value
=
"/
insertR
unLog"
)
@PostMapping
(
value
=
"/
equitment/r
unLog"
)
public
ResponseEntity
<
JSONObject
>
insertRunLog
(
RunLog
runLog
)
{
public
ResponseEntity
<
JSONObject
>
insertRunLog
(
RunLog
runLog
)
{
JSONObject
resultMap
=
new
JSONObject
();
JSONObject
resultMap
=
new
JSONObject
();
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/MenuController.java
View file @
9776428d
This diff is collapsed.
Click to expand it.
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoxOperationController.java
View file @
9776428d
package
cn
.
wisenergy
.
chnmuseum
.
party
.
web
.
controller
;
package
cn
.
wisenergy
.
chnmuseum
.
party
.
web
.
controller
;
import
cn.wisenergy.chnmuseum.party.auth.SHA256PasswordEncryptionService
;
import
cn.wisenergy.chnmuseum.party.model.TUser
;
import
cn.wisenergy.chnmuseum.party.model.TUser
;
import
cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl
;
import
cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
cn.wisenergy.chnmuseum.party.web.controller.base.BaseController
;
import
cn.wisenergy.chnmuseum.party.web.controller.base.BaseController
;
import
cn.wisenergy.chnmuseum.party.model.TBoxOperation
;
import
cn.wisenergy.chnmuseum.party.model.TBoxOperation
;
import
cn.wisenergy.chnmuseum.party.service.TBoxOperationService
;
import
cn.wisenergy.chnmuseum.party.service.TBoxOperationService
;
import
cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum
;
import
cn.wisenergy.chnmuseum.party.common.validator.groups.Add
;
import
cn.wisenergy.chnmuseum.party.common.validator.groups.Update
;
import
cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParam
;
...
@@ -23,13 +17,9 @@ import io.swagger.annotations.ApiOperation;
...
@@ -23,13 +17,9 @@ import io.swagger.annotations.ApiOperation;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.springframework.cglib.core.Local
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.stereotype.Controller
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
javax.validation.constraints.NotNull
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
...
src/main/resources/mapper/AuditMapper.xml
View file @
9776428d
...
@@ -13,15 +13,15 @@
...
@@ -13,15 +13,15 @@
<result
column=
"operation"
property=
"operation"
/>
<result
column=
"operation"
property=
"operation"
/>
<result
column=
"status"
property=
"status"
/>
<result
column=
"status"
property=
"status"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"update_time"
property=
"updateTime"
/>
<result
column=
"first_time"
property=
"firstTime"
/>
<result
column=
"second_time"
property=
"secondTime"
/>
<result
column=
"is_deleted"
property=
"isDeleted"
/>
<result
column=
"is_deleted"
property=
"isDeleted"
/>
<result
column=
"remarks"
property=
"remarks"
/>
<result
column=
"first_remarks"
property=
"firstRemarks"
/>
<result
column=
"second_remarks"
property=
"secondRemarks"
/>
<result
column=
"level"
property=
"level"
/>
</resultMap>
</resultMap>
<!-- 通用查询结果列 -->
<sql
id=
"Base_Column_List"
>
id, content, organ_id, ref_item_id, user_id, type, operation, status, create_time, update_time, is_deleted, remarks
</sql>
<select
id=
"getUserList"
resultMap=
"BaseResultMap"
>
<select
id=
"getUserList"
resultMap=
"BaseResultMap"
>
select a.*,o.name org_name,u.user_name user_name
select a.*,o.name org_name,u.user_name user_name
...
...
src/main/resources/mapper/MenuMapper.xml
View file @
9776428d
...
@@ -8,8 +8,8 @@
...
@@ -8,8 +8,8 @@
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"update_time"
property=
"updateTime"
/>
<result
column=
"update_time"
property=
"updateTime"
/>
<result
column=
"is_deleted"
property=
"isDeleted"
/>
<result
column=
"is_deleted"
property=
"isDeleted"
/>
<result
column=
"
menu_url"
property=
"menuU
rl"
/>
<result
column=
"
url"
property=
"u
rl"
/>
<result
column=
"
menu_name"
property=
"menuN
ame"
/>
<result
column=
"
name"
property=
"n
ame"
/>
<result
column=
"parent_id"
property=
"parentId"
/>
<result
column=
"parent_id"
property=
"parentId"
/>
<result
column=
"is_button"
property=
"isButton"
/>
<result
column=
"is_button"
property=
"isButton"
/>
<result
column=
"level"
property=
"level"
/>
<result
column=
"level"
property=
"level"
/>
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<select
id=
"getUserMenuPerms"
resultMap=
"BaseResultMap"
>
<select
id=
"getUserMenuPerms"
resultMap=
"BaseResultMap"
>
SELECT distinct
SELECT distinct
m.id,m.
menu_name,m.menu_
url,m.parent_id,m.sort,m.is_button,m.level
m.id,m.
name,m.
url,m.parent_id,m.sort,m.is_button,m.level
FROM
FROM
ref_role_menu rm
ref_role_menu rm
LEFT JOIN menu m ON m.id = rm.menu_id
LEFT JOIN menu m ON m.id = rm.menu_id
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment