Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzuaa
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzuaa
提交
c332ffb0
提交
c332ffb0
编写于
7月 03, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码
上级
566f1b42
变更
25
显示空白字符变更
内嵌
并排
正在显示
25 个修改的文件
包含
1533 行增加
和
66 行删除
+1533
-66
CHANGELOG.md
app_web/CHANGELOG.md
+34
-0
app-register.ts
app_web/src/app-register.ts
+2
-0
app-actionbar.vue
app_web/src/components/app-actionbar/app-actionbar.vue
+1
-1
app-update-password.less
...c/components/app-update-password/app-update-password.less
+12
-0
app-update-password.vue
...rc/components/app-update-password/app-update-password.vue
+150
-0
app-user.vue
app_web/src/components/app-user/app-user.vue
+12
-1
filter-tree.vue
app_web/src/components/filter-tree/filter-tree.vue
+0
-1
components_en_US.ts
app_web/src/locale/lanres/components/components_en_US.ts
+1
-0
components_zh_CN.ts
app_web/src/locale/lanres/components/components_zh_CN.ts
+4
-3
sys-user_en_US.ts
...web/src/locale/lanres/entities/sys-user/sys-user_en_US.ts
+27
-0
sys-user_zh_CN.ts
...web/src/locale/lanres/entities/sys-user/sys-user_zh_CN.ts
+27
-0
entity-service.ts
app_web/src/service/entity-service.ts
+11
-0
getters.ts
app_web/src/store/modules/view-action/getters.ts
+3
-3
mutations.ts
app_web/src/store/modules/view-action/mutations.ts
+3
-8
default-drbar-model.ts
...src/widgets/sys-user/default-drbar/default-drbar-model.ts
+81
-0
mpickup-viewpickupviewpanel-pickupviewpanel-model.ts
...anel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts
+81
-0
pickup-viewpickupviewpanel-pickupviewpanel-model.ts
...panel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
+81
-0
yarn.lock
app_web/yarn.lock
+150
-36
SysUser.java
...ore/src/main/java/cn/ibizlab/core/uaa/domain/SysUser.java
+402
-0
ISysUserService.java
...ain/java/cn/ibizlab/core/uaa/service/ISysUserService.java
+2
-0
SysUserServiceImpl.java
.../cn/ibizlab/core/uaa/service/impl/SysUserServiceImpl.java
+19
-0
SysUserMapper.xml
...e/src/main/resources/mapper/uaa/sysuser/SysUserMapper.xml
+1
-1
systemResource.json
...aa-core/src/main/resources/permission/systemResource.json
+1
-1
SysUserDTO.java
...ider-api/src/main/java/cn/ibizlab/api/dto/SysUserDTO.java
+417
-0
SysUserResource.java
...pi/src/main/java/cn/ibizlab/api/rest/SysUserResource.java
+11
-11
未找到文件。
app_web/CHANGELOG.md
浏览文件 @
c332ffb0
## v7.0.0-alpha.12 [2020-7-2]
### Bug修复
修复mpicker解析调整
修复表格列class逻辑调整
修复面板标签,隐藏表单项
修复嵌入视图导航服务逻辑调整
修复选择多数据视图选择数据异常
修复多行输入十行 高度问题
### 功能新增及优化
#### 模板
新增表单显示更多模式(658)
新增首页应用切换器(658)
新增状态向导面板(658)
优化门户操作栏
优化应用级数据状态同步功能
#### 基础文件
新增修改密码功能(654)
## v7.0.0-alpha.11 [2020-6-21]
## v7.0.0-alpha.11 [2020-6-21]
### Bug修复
### Bug修复
...
...
app_web/src/app-register.ts
浏览文件 @
c332ffb0
...
@@ -76,6 +76,7 @@ import ContextMenuDrag from './components/context-menu-drag/context-menu-drag.vu
...
@@ -76,6 +76,7 @@ import ContextMenuDrag from './components/context-menu-drag/context-menu-drag.vu
import
AppOrgSelect
from
'./components/app-org-select/app-org-select.vue'
import
AppOrgSelect
from
'./components/app-org-select/app-org-select.vue'
import
AppDepartmentSelect
from
'./components/app-department-select/app-department-select.vue'
import
AppDepartmentSelect
from
'./components/app-department-select/app-department-select.vue'
import
AppGroupSelect
from
'./components/app-group-select/app-group-select.vue'
import
AppGroupSelect
from
'./components/app-group-select/app-group-select.vue'
import
UpdatePwd
from
'./components/app-update-password/app-update-password.vue'
// 全局挂载UI实体服务注册中心
// 全局挂载UI实体服务注册中心
window
[
'uiServiceRegister'
]
=
uiServiceRegister
;
window
[
'uiServiceRegister'
]
=
uiServiceRegister
;
// 全局挂载功能服务注册中心
// 全局挂载功能服务注册中心
...
@@ -163,5 +164,6 @@ export const AppComponents = {
...
@@ -163,5 +164,6 @@ export const AppComponents = {
v
.
component
(
'app-breadcrumb'
,
Breadcrumb
);
v
.
component
(
'app-breadcrumb'
,
Breadcrumb
);
v
.
component
(
'app-transfer'
,
AppTransfer
);
v
.
component
(
'app-transfer'
,
AppTransfer
);
v
.
component
(
'context-menu-drag'
,
ContextMenuDrag
);
v
.
component
(
'context-menu-drag'
,
ContextMenuDrag
);
v
.
component
(
'app-update-password'
,
UpdatePwd
);
},
},
};
};
\ No newline at end of file
app_web/src/components/app-actionbar/app-actionbar.vue
浏览文件 @
c332ffb0
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<div
class=
"app-actionbar"
>
<div
class=
"app-actionbar"
>
<div
class=
"app-actionbar-item"
v-for=
"(item,index) in items"
:key=
"index"
>
<div
class=
"app-actionbar-item"
v-for=
"(item,index) in items"
:key=
"index"
>
<Badge
v-if=
"item.counterService&&item.counterService.counterData"
:count=
"item.counterService.counterData[item.counterId]"
type=
"primary"
>
<Badge
v-if=
"item.counterService&&item.counterService.counterData"
:count=
"item.counterService.counterData[item.counterId]"
type=
"primary"
>
<i-button
@
click=
"handleClick(item.viewlogicname)"
>
{{
item
.
actionName
}}
</i-button>
<i-button
@
click=
"handleClick(item.viewlogicname)"
>
<i
v-if=
"item.icon"
style=
"margin-right: 5px;"
:class=
"item.icon"
></i>
{{
item
.
actionName
}}
</i-button>
</Badge>
</Badge>
<i-button
v-else
@
click=
"handleClick(item.viewlogicname)"
>
{{
item
.
actionName
}}
</i-button>
<i-button
v-else
@
click=
"handleClick(item.viewlogicname)"
>
{{
item
.
actionName
}}
</i-button>
</div>
</div>
...
...
app_web/src/components/app-update-password/app-update-password.less
0 → 100644
浏览文件 @
c332ffb0
.update-password{
.password-item{
margin-top:10px;
padding:0 10px 0 10px;
.ivu-btn{
margin-top:15px;
}
}
.password-btn{
margin-top: 42px;
}
}
\ No newline at end of file
app_web/src/components/app-update-password/app-update-password.vue
0 → 100644
浏览文件 @
c332ffb0
<
template
>
<div
class=
"update-password"
>
<div
class=
"password-item"
>
<label
for
>
原密码:
<Input
type=
"password"
v-model=
"oldPwd"
@
on-blur=
"oldPwdVaild"
/>
</label>
</div>
<div
class=
"password-item"
>
<label
for
>
新密码:
<Input
type=
"password"
v-model=
"newPwd"
@
on-blur=
"newPwdVaild"
/>
</label>
</div>
<div
class=
"password-item"
>
<label
for
>
确认密码:
<Input
type=
"password"
v-model=
"confirmPwd"
:disabled=
"!this.newPwd"
@
on-blur=
"confirmVaild"
/>
</label>
</div>
<div
class=
"password-item password-btn"
>
<Button
type=
"primary"
long
:disabled=
"!oldPwd || !newPwd || !confirmPwd || disUpdate"
@
click=
"updatePwd"
>
确认修改
</Button>
</div>
</div>
</
template
>
<
script
lang =
'ts'
>
import
{
Component
,
Vue
,
Prop
,
Model
,
Watch
}
from
"vue-property-decorator"
;
import
{
Subject
}
from
"rxjs"
;
import
{
AppModal
}
from
"@/utils"
;
import
EntityService
from
'@/service/entity-service'
;
@
Component
({})
export
default
class
AppUpdatePassword
extends
Vue
{
/**
* 原密码
*
* @public
* @memberof AppUpdatePassword
*/
public
oldPwd
:
string
=
""
;
/**
* 新密码
*
* @public
* @memberof AppUpdatePassword
*/
public
newPwd
:
string
=
""
;
/**
* 确认密码
*
* @public
* @memberof AppUpdatePassword
*/
public
confirmPwd
:
string
=
""
;
/**
* 是否能禁用确认修改
*
* @public
* @memberof AppUpdatePassword
*/
public
disUpdate
:
boolean
=
true
;
/**
* 校验输入的原密码是否为空
*
* @public
* @memberof AppUpdatePassword
*/
public
oldPwdVaild
(){
if
(
!
this
.
oldPwd
){
this
.
$Notice
.
error
({
title
:
'原密码不能为空!'
,
duration
:
3
});
}
}
/**
* 校验输入的新密码是否为空
*
* @public
* @memberof AppUpdatePassword
*/
public
newPwdVaild
(){
if
(
!
this
.
newPwd
){
this
.
$Notice
.
error
({
title
:
'新密码不能为空!'
,
duration
:
3
});
}
}
/**
* 校验确认密码与新密码是否一致
*
* @public
* @memberof AppUpdatePassword
*/
public
confirmVaild
()
{
if
(
this
.
newPwd
&&
this
.
confirmPwd
)
{
if
(
this
.
confirmPwd
!==
this
.
newPwd
)
{
this
.
$Notice
.
error
({
title
:
'两次输入密码不一致!'
,
duration
:
3
});
}
else
{
this
.
disUpdate
=
false
;
}
}
}
/**
* 实体服务对象
*
* @protected
* @type {EntityService}
* @memberof AppUpdatePassword
*/
protected
entityService
:
EntityService
=
new
EntityService
();
/**
* 修改密码
*
* @public
* @memberof AppUpdatePassword
*/
public
updatePwd
(){
const
post
:
Promise
<
any
>
=
this
.
entityService
.
changPassword
(
null
,{
oldPwd
:
this
.
oldPwd
,
newPwd
:
this
.
newPwd
});
post
.
then
((
response
:
any
)
=>
{
if
(
response
&&
response
.
status
===
200
)
{
this
.
$emit
(
"close"
);
}
}).
catch
((
error
:
any
)
=>
{
this
.
$Notice
.
error
({
title
:
'系统异常'
,
duration
:
3
});
console
.
error
(
error
);
})
}
}
</
script
>
<
style
lang=
"less"
>
@import './app-update-password.less';
</
style
>
\ No newline at end of file
app_web/src/components/app-user/app-user.vue
浏览文件 @
c332ffb0
...
@@ -6,6 +6,10 @@
...
@@ -6,6 +6,10 @@
<avatar
:src=
"user.avatar"
/>
<avatar
:src=
"user.avatar"
/>
</div>
</div>
<dropdown-menu
class=
'menu'
slot=
'list'
style=
'font-size: 15px !important;'
>
<dropdown-menu
class=
'menu'
slot=
'list'
style=
'font-size: 15px !important;'
>
<dropdown-item
name=
'updatepwd'
style=
'font-size: 15px !important;'
>
<span><Icon
type=
"ios-create-outline"
style=
'margin-right: 8px;'
/></span>
<span>
{{
$t
(
'components.appUser.changepwd'
)
}}
</span>
</dropdown-item>
<dropdown-item
name=
'logout'
style=
'font-size: 15px !important;'
>
<dropdown-item
name=
'logout'
style=
'font-size: 15px !important;'
>
<span><i
aria-hidden=
'true'
class=
'ivu-icon ivu-icon-md-power'
style=
'margin-right: 8px;'
></i></span>
<span><i
aria-hidden=
'true'
class=
'ivu-icon ivu-icon-md-power'
style=
'margin-right: 8px;'
></i></span>
<span>
{{
$t
(
'components.appUser.logout'
)
}}
</span>
<span>
{{
$t
(
'components.appUser.logout'
)
}}
</span>
...
@@ -16,7 +20,7 @@
...
@@ -16,7 +20,7 @@
</
template
>
</
template
>
<
script
lang =
'ts'
>
<
script
lang =
'ts'
>
import
{
Vue
,
Component
}
from
'vue-property-decorator'
;
import
{
Vue
,
Component
}
from
'vue-property-decorator'
;
import
{
Subject
}
from
'rxjs'
;
@
Component
({
@
Component
({
})
})
export
default
class
AppUser
extends
Vue
{
export
default
class
AppUser
extends
Vue
{
...
@@ -46,6 +50,13 @@ export default class AppUser extends Vue {
...
@@ -46,6 +50,13 @@ export default class AppUser extends Vue {
this
.
logout
();
this
.
logout
();
}
}
});
});
}
else
if
(
Object
.
is
(
data
,
'updatepwd'
))
{
let
container
:
Subject
<
any
>
=
this
.
$appmodal
.
openModal
({
viewname
:
'app-update-password'
,
title
:
"修改密码"
,
width
:
500
,
height
:
400
,
},
{},
{});
container
.
subscribe
((
result
:
any
)
=>
{
if
(
!
result
||
!
Object
.
is
(
result
.
ret
,
'OK'
))
{
return
;
}
});
}
}
}
}
...
...
app_web/src/components/filter-tree/filter-tree.vue
浏览文件 @
c332ffb0
...
@@ -89,7 +89,6 @@ export default class FilterTree extends Vue {
...
@@ -89,7 +89,6 @@ export default class FilterTree extends Vue {
};
};
if
(
this
.
datas
.
length
==
0
)
{
if
(
this
.
datas
.
length
==
0
)
{
this
.
onAddItem
(
root
);
this
.
onAddItem
(
root
);
this
.
onAddItem
(
root
);
}
}
return
[
root
];
return
[
root
];
}
}
...
...
app_web/src/locale/lanres/components/components_en_US.ts
浏览文件 @
c332ffb0
...
@@ -157,6 +157,7 @@ export default {
...
@@ -157,6 +157,7 @@ export default {
name
:
'System'
,
name
:
'System'
,
logout
:
'Logout'
,
logout
:
'Logout'
,
surelogout
:
'Are you sure logout?'
,
surelogout
:
'Are you sure logout?'
,
changepwd
:
"Change Password"
,
},
},
appTheme
:
{
appTheme
:
{
caption
:
{
caption
:
{
...
...
app_web/src/locale/lanres/components/components_zh_CN.ts
浏览文件 @
c332ffb0
...
@@ -152,12 +152,13 @@ export default {
...
@@ -152,12 +152,13 @@ export default {
placeholder
:
'请输入密码'
,
placeholder
:
'请输入密码'
,
message
:
'密码不能为空'
,
message
:
'密码不能为空'
,
},
},
loginfailed
:
'登
陆
失败'
,
loginfailed
:
'登
录
失败'
,
},
},
appUser
:
{
appUser
:
{
name
:
'系统管理员'
,
name
:
'系统管理员'
,
logout
:
'退出登陆'
,
logout
:
'退出登录'
,
surelogout
:
'确认要退出登陆?'
,
surelogout
:
'确认要退出登录?'
,
changepwd
:
"修改密码"
,
},
},
appTheme
:
{
appTheme
:
{
caption
:
{
caption
:
{
...
...
app_web/src/locale/lanres/entities/sys-user/sys-user_en_US.ts
浏览文件 @
c332ffb0
...
@@ -5,6 +5,33 @@ export default {
...
@@ -5,6 +5,33 @@ export default {
username
:
"用户全局名"
,
username
:
"用户全局名"
,
personname
:
"用户姓名"
,
personname
:
"用户姓名"
,
password
:
"密码"
,
password
:
"密码"
,
usercode
:
"用户工号"
,
loginname
:
"登录名"
,
domains
:
"区属"
,
mdeptid
:
"主部门"
,
mdeptcode
:
"主部门代码"
,
mdeptname
:
"主部门名称"
,
bcode
:
"业务编码"
,
postid
:
"岗位标识"
,
postcode
:
"岗位代码"
,
postname
:
"岗位名称"
,
orgid
:
"单位"
,
orgcode
:
"单位代码"
,
orgname
:
"单位名称"
,
nickname
:
"昵称别名"
,
certcode
:
"证件号码"
,
sex
:
"性别"
,
birthday
:
"出生日期"
,
phone
:
"联系方式"
,
email
:
"邮件"
,
avatar
:
"社交账号"
,
addr
:
"地址"
,
usericon
:
"照片"
,
theme
:
"样式"
,
lang
:
"语言"
,
fontsize
:
"字号"
,
memo
:
"备注"
,
reserver
:
"保留"
,
},
},
views
:
{
views
:
{
mpickupview
:
{
mpickupview
:
{
...
...
app_web/src/locale/lanres/entities/sys-user/sys-user_zh_CN.ts
浏览文件 @
c332ffb0
...
@@ -4,6 +4,33 @@ export default {
...
@@ -4,6 +4,33 @@ export default {
username
:
"用户全局名"
,
username
:
"用户全局名"
,
personname
:
"用户姓名"
,
personname
:
"用户姓名"
,
password
:
"密码"
,
password
:
"密码"
,
usercode
:
"用户工号"
,
loginname
:
"登录名"
,
domains
:
"区属"
,
mdeptid
:
"主部门"
,
mdeptcode
:
"主部门代码"
,
mdeptname
:
"主部门名称"
,
bcode
:
"业务编码"
,
postid
:
"岗位标识"
,
postcode
:
"岗位代码"
,
postname
:
"岗位名称"
,
orgid
:
"单位"
,
orgcode
:
"单位代码"
,
orgname
:
"单位名称"
,
nickname
:
"昵称别名"
,
certcode
:
"证件号码"
,
sex
:
"性别"
,
birthday
:
"出生日期"
,
phone
:
"联系方式"
,
email
:
"邮件"
,
avatar
:
"社交账号"
,
addr
:
"地址"
,
usericon
:
"照片"
,
theme
:
"样式"
,
lang
:
"语言"
,
fontsize
:
"字号"
,
memo
:
"备注"
,
reserver
:
"保留"
,
},
},
views
:
{
views
:
{
mpickupview
:
{
mpickupview
:
{
...
...
app_web/src/service/entity-service.ts
浏览文件 @
c332ffb0
...
@@ -931,4 +931,15 @@ export default class EntityService {
...
@@ -931,4 +931,15 @@ export default class EntityService {
return
Http
.
getInstance
().
put
(
`uaa/access-center/app-switcher/default`
,
data
,
isloading
);
return
Http
.
getInstance
().
put
(
`uaa/access-center/app-switcher/default`
,
data
,
isloading
);
}
}
/**
* 修改密码
*
* @param context
* @param data
* @param isloading
*/
public
async
changPassword
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
return
Http
.
getInstance
().
post
(
`v7/changepwd`
,
data
,
isloading
);
}
}
}
\ No newline at end of file
app_web/src/store/modules/view-action/getters.ts
浏览文件 @
c332ffb0
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
export
const
getAppView
=
(
state
:
any
)
=>
(
viewtag
:
string
)
=>
{
export
const
getAppView
=
(
state
:
any
)
=>
(
viewtag
:
string
)
=>
{
const
createdview
=
state
.
createdviews
.
find
((
appview
:
any
)
=>
Object
.
is
(
appview
.
secondtag
,
viewtag
));
const
createdview
=
state
.
createdviews
.
find
((
appview
:
any
)
=>
Object
.
is
(
appview
.
secondtag
,
viewtag
));
if
(
!
createdview
)
{
if
(
!
createdview
)
{
console
.
log
(
`----视图
${
viewtag
}
不存在-----
`
)
console
.
warn
(
`获取应用视图实例,,视图「
${
viewtag
}
」不存在
`
)
return
null
;
return
null
;
}
}
return
createdview
;
return
createdview
;
...
@@ -20,7 +20,7 @@ export const getAppView = (state: any) => (viewtag: string) => {
...
@@ -20,7 +20,7 @@ export const getAppView = (state: any) => (viewtag: string) => {
export
const
getViewDataChangeState
=
(
state
:
any
)
=>
(
viewtag
:
string
)
=>
{
export
const
getViewDataChangeState
=
(
state
:
any
)
=>
(
viewtag
:
string
)
=>
{
const
createdview
=
state
.
createdviews
.
find
((
appview
:
any
)
=>
Object
.
is
(
appview
.
secondtag
,
viewtag
));
const
createdview
=
state
.
createdviews
.
find
((
appview
:
any
)
=>
Object
.
is
(
appview
.
secondtag
,
viewtag
));
if
(
!
createdview
)
{
if
(
!
createdview
)
{
console
.
log
(
`----视图
${
viewtag
}
不存在-----
`
)
console
.
warn
(
`获取视图数据状态,,视图「
${
viewtag
}
」不存在
`
)
return
false
;
return
false
;
}
}
return
createdview
.
viewdatachange
;
return
createdview
.
viewdatachange
;
...
@@ -34,7 +34,7 @@ export const getViewDataChangeState = (state:any) => (viewtag: string) => {
...
@@ -34,7 +34,7 @@ export const getViewDataChangeState = (state:any) => (viewtag: string) => {
export
const
getRefreshData
=
(
state
:
any
)
=>
(
viewtag
:
string
)
=>
{
export
const
getRefreshData
=
(
state
:
any
)
=>
(
viewtag
:
string
)
=>
{
const
createdview
=
state
.
createdviews
.
find
((
appview
:
any
)
=>
Object
.
is
(
appview
.
secondtag
,
viewtag
));
const
createdview
=
state
.
createdviews
.
find
((
appview
:
any
)
=>
Object
.
is
(
appview
.
secondtag
,
viewtag
));
if
(
!
createdview
)
{
if
(
!
createdview
)
{
console
.
log
(
`----视图
${
viewtag
}
不存在-----
`
)
console
.
warn
(
`获取数据刷新状态,视图「
${
viewtag
}
」不存在
`
)
return
null
;
return
null
;
}
}
return
createdview
.
refreshdata
;
return
createdview
.
refreshdata
;
...
...
app_web/src/store/modules/view-action/mutations.ts
浏览文件 @
c332ffb0
...
@@ -6,15 +6,10 @@
...
@@ -6,15 +6,10 @@
* @param param1
* @param param1
*/
*/
export
const
createdView
=
(
state
:
any
,
{
viewtag
,
secondtag
}:
{
viewtag
:
string
,
secondtag
:
string
})
=>
{
export
const
createdView
=
(
state
:
any
,
{
viewtag
,
secondtag
}:
{
viewtag
:
string
,
secondtag
:
string
})
=>
{
// 该视图是否被创建
// const index = state.createdviews.findIndex((view: any) => Object.is(view.secondtag, viewtag));
// if (index !== -1) {
// return;
// }
// 原始数据中是否存在
// 原始数据中是否存在
const
appview
=
state
.
appviews
.
find
((
appview
:
any
)
=>
Object
.
is
(
appview
.
viewtag
,
viewtag
));
const
appview
=
state
.
appviews
.
find
((
appview
:
any
)
=>
Object
.
is
(
appview
.
viewtag
,
viewtag
));
if
(
!
appview
)
{
if
(
!
appview
)
{
console
.
log
(
`----视图标识
${
viewtag
}
不存在-----`
)
console
.
warn
(
`视图「
${
viewtag
}
」原始数据不存在`
);
return
;
return
;
}
}
const
_appview
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
appview
));
const
_appview
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
appview
));
...
@@ -48,7 +43,7 @@ export const removeView = (state: any, viewtag: string) => {
...
@@ -48,7 +43,7 @@ export const removeView = (state: any, viewtag: string) => {
export
const
setViewDataChange
=
(
state
:
any
,
{
viewtag
,
viewdatachange
}:
{
viewtag
:
string
,
viewdatachange
:
boolean
})
=>
{
export
const
setViewDataChange
=
(
state
:
any
,
{
viewtag
,
viewdatachange
}:
{
viewtag
:
string
,
viewdatachange
:
boolean
})
=>
{
const
createdview
=
state
.
createdviews
.
find
((
appview
:
any
)
=>
Object
.
is
(
appview
.
secondtag
,
viewtag
));
const
createdview
=
state
.
createdviews
.
find
((
appview
:
any
)
=>
Object
.
is
(
appview
.
secondtag
,
viewtag
));
if
(
!
createdview
)
{
if
(
!
createdview
)
{
console
.
log
(
`----视图标识
${
viewtag
}
不存在-----
`
)
console
.
warn
(
`设置数据状态变更,视图「
${
viewtag
}
」不存在
`
)
return
;
return
;
}
}
createdview
.
viewdatachange
=
viewdatachange
;
createdview
.
viewdatachange
=
viewdatachange
;
...
@@ -63,7 +58,7 @@ export const setViewDataChange = (state: any, { viewtag, viewdatachange }: { vie
...
@@ -63,7 +58,7 @@ export const setViewDataChange = (state: any, { viewtag, viewdatachange }: { vie
export
const
refreshViewData
=
(
state
:
any
,
{
viewtag
}:
{
viewtag
:
string
})
=>
{
export
const
refreshViewData
=
(
state
:
any
,
{
viewtag
}:
{
viewtag
:
string
})
=>
{
const
createdview
=
state
.
createdviews
.
find
((
appview
:
any
)
=>
Object
.
is
(
appview
.
secondtag
,
viewtag
));
const
createdview
=
state
.
createdviews
.
find
((
appview
:
any
)
=>
Object
.
is
(
appview
.
secondtag
,
viewtag
));
if
(
!
createdview
)
{
if
(
!
createdview
)
{
console
.
log
(
`----视图标识
${
viewtag
}
不存在-----
`
)
console
.
warn
(
`刷新视图数据,视图「
${
viewtag
}
」不存在
`
)
return
;
return
;
}
}
createdview
.
refreshdata
+=
1
;
createdview
.
refreshdata
+=
1
;
...
...
app_web/src/widgets/sys-user/default-drbar/default-drbar-model.ts
浏览文件 @
c332ffb0
...
@@ -27,6 +27,87 @@ export default class DefaultModel {
...
@@ -27,6 +27,87 @@ export default class DefaultModel {
{
{
name
:
'password'
,
name
:
'password'
,
},
},
{
name
:
'usercode'
,
},
{
name
:
'loginname'
,
},
{
name
:
'domains'
,
},
{
name
:
'mdeptid'
,
},
{
name
:
'mdeptcode'
,
},
{
name
:
'mdeptname'
,
},
{
name
:
'bcode'
,
},
{
name
:
'postid'
,
},
{
name
:
'postcode'
,
},
{
name
:
'postname'
,
},
{
name
:
'orgid'
,
},
{
name
:
'orgcode'
,
},
{
name
:
'orgname'
,
},
{
name
:
'nickname'
,
},
{
name
:
'certcode'
,
},
{
name
:
'sex'
,
},
{
name
:
'birthday'
,
},
{
name
:
'phone'
,
},
{
name
:
'email'
,
},
{
name
:
'avatar'
,
},
{
name
:
'addr'
,
},
{
name
:
'usericon'
,
},
{
name
:
'theme'
,
},
{
name
:
'lang'
,
},
{
name
:
'fontsize'
,
},
{
name
:
'memo'
,
},
{
name
:
'reserver'
,
},
]
]
}
}
...
...
app_web/src/widgets/sys-user/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @
c332ffb0
...
@@ -27,6 +27,87 @@ export default class MPickupViewpickupviewpanelModel {
...
@@ -27,6 +27,87 @@ export default class MPickupViewpickupviewpanelModel {
{
{
name
:
'password'
,
name
:
'password'
,
},
},
{
name
:
'usercode'
,
},
{
name
:
'loginname'
,
},
{
name
:
'domains'
,
},
{
name
:
'mdeptid'
,
},
{
name
:
'mdeptcode'
,
},
{
name
:
'mdeptname'
,
},
{
name
:
'bcode'
,
},
{
name
:
'postid'
,
},
{
name
:
'postcode'
,
},
{
name
:
'postname'
,
},
{
name
:
'orgid'
,
},
{
name
:
'orgcode'
,
},
{
name
:
'orgname'
,
},
{
name
:
'nickname'
,
},
{
name
:
'certcode'
,
},
{
name
:
'sex'
,
},
{
name
:
'birthday'
,
},
{
name
:
'phone'
,
},
{
name
:
'email'
,
},
{
name
:
'avatar'
,
},
{
name
:
'addr'
,
},
{
name
:
'usericon'
,
},
{
name
:
'theme'
,
},
{
name
:
'lang'
,
},
{
name
:
'fontsize'
,
},
{
name
:
'memo'
,
},
{
name
:
'reserver'
,
},
]
]
}
}
...
...
app_web/src/widgets/sys-user/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @
c332ffb0
...
@@ -27,6 +27,87 @@ export default class PickupViewpickupviewpanelModel {
...
@@ -27,6 +27,87 @@ export default class PickupViewpickupviewpanelModel {
{
{
name
:
'password'
,
name
:
'password'
,
},
},
{
name
:
'usercode'
,
},
{
name
:
'loginname'
,
},
{
name
:
'domains'
,
},
{
name
:
'mdeptid'
,
},
{
name
:
'mdeptcode'
,
},
{
name
:
'mdeptname'
,
},
{
name
:
'bcode'
,
},
{
name
:
'postid'
,
},
{
name
:
'postcode'
,
},
{
name
:
'postname'
,
},
{
name
:
'orgid'
,
},
{
name
:
'orgcode'
,
},
{
name
:
'orgname'
,
},
{
name
:
'nickname'
,
},
{
name
:
'certcode'
,
},
{
name
:
'sex'
,
},
{
name
:
'birthday'
,
},
{
name
:
'phone'
,
},
{
name
:
'email'
,
},
{
name
:
'avatar'
,
},
{
name
:
'addr'
,
},
{
name
:
'usericon'
,
},
{
name
:
'theme'
,
},
{
name
:
'lang'
,
},
{
name
:
'fontsize'
,
},
{
name
:
'memo'
,
},
{
name
:
'reserver'
,
},
]
]
}
}
...
...
app_web/yarn.lock
浏览文件 @
c332ffb0
...
@@ -1203,6 +1203,13 @@
...
@@ -1203,6 +1203,13 @@
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
"@npmcli/move-file@^1.0.1":
version "1.0.1"
resolved "https://registry.npm.taobao.org/@npmcli/move-file/download/@npmcli/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464"
integrity sha1-3hAwcNrA9IzknPZpPCOvWcD3BGQ=
dependencies:
mkdirp "^1.0.4"
"@soda/friendly-errors-webpack-plugin@^1.7.1":
"@soda/friendly-errors-webpack-plugin@^1.7.1":
version "1.7.1"
version "1.7.1"
resolved "https://registry.yarnpkg.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz#706f64bcb4a8b9642b48ae3ace444c70334d615d"
resolved "https://registry.yarnpkg.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz#706f64bcb4a8b9642b48ae3ace444c70334d615d"
...
@@ -1298,6 +1305,11 @@
...
@@ -1298,6 +1305,11 @@
dependencies:
dependencies:
jest-diff "^24.3.0"
jest-diff "^24.3.0"
"@types/json-schema@^7.0.4":
version "7.0.5"
resolved "https://registry.npm.taobao.org/@types/json-schema/download/@types/json-schema-7.0.5.tgz?cache=0&sync_timestamp=1591720889158&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fjson-schema%2Fdownload%2F%40types%2Fjson-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd"
integrity sha1-3M5EMOZLRDuolF8CkPtWStW6xt0=
"@types/minimatch@*":
"@types/minimatch@*":
version "3.0.3"
version "3.0.3"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
...
@@ -1881,6 +1893,16 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.5.5:
...
@@ -1881,6 +1893,16 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.5.5:
json-schema-traverse "^0.4.1"
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
uri-js "^4.2.2"
ajv@^6.12.2:
version "6.12.2"
resolved "https://registry.npm.taobao.org/ajv/download/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
integrity sha1-xinF7O0XuvMUQ3kY0tqIyZ1ZWM0=
dependencies:
fast-deep-equal "^3.1.1"
fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
alphanum-sort@^1.0.0:
alphanum-sort@^1.0.0:
version "1.0.2"
version "1.0.2"
resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
...
@@ -2162,13 +2184,6 @@ axios@^0.19.1:
...
@@ -2162,13 +2184,6 @@ axios@^0.19.1:
dependencies:
dependencies:
follow-redirects "1.5.10"
follow-redirects "1.5.10"
axios@^0.19.2:
version "0.19.2"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
dependencies:
follow-redirects "1.5.10"
babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
version "6.26.0"
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
...
@@ -2666,6 +2681,29 @@ cacache@^13.0.1:
...
@@ -2666,6 +2681,29 @@ cacache@^13.0.1:
ssri "^7.0.0"
ssri "^7.0.0"
unique-filename "^1.1.1"
unique-filename "^1.1.1"
cacache@^15.0.3:
version "15.0.4"
resolved "https://registry.npm.taobao.org/cacache/download/cacache-15.0.4.tgz#b2c23cf4ac4f5ead004fb15a0efb0a20340741f1"
integrity sha1-ssI89KxPXq0AT7FaDvsKIDQHQfE=
dependencies:
"@npmcli/move-file" "^1.0.1"
chownr "^2.0.0"
fs-minipass "^2.0.0"
glob "^7.1.4"
infer-owner "^1.0.4"
lru-cache "^5.1.1"
minipass "^3.1.1"
minipass-collect "^1.0.2"
minipass-flush "^1.0.5"
minipass-pipeline "^1.2.2"
mkdirp "^1.0.3"
p-map "^4.0.0"
promise-inflight "^1.0.1"
rimraf "^3.0.2"
ssri "^8.0.0"
tar "^6.0.2"
unique-filename "^1.1.1"
cache-base@^1.0.1:
cache-base@^1.0.1:
version "1.0.1"
version "1.0.1"
resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
...
@@ -2851,6 +2889,11 @@ chownr@^1.1.1, chownr@^1.1.2:
...
@@ -2851,6 +2889,11 @@ chownr@^1.1.1, chownr@^1.1.2:
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
chownr@^2.0.0:
version "2.0.0"
resolved "https://registry.npm.taobao.org/chownr/download/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
integrity sha1-Fb++U9LqtM9w8YqM1o6+Wzyx3s4=
chrome-trace-event@^1.0.2:
chrome-trace-event@^1.0.2:
version "1.0.2"
version "1.0.2"
resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
...
@@ -3121,6 +3164,17 @@ compressible@~2.0.16:
...
@@ -3121,6 +3164,17 @@ compressible@~2.0.16:
dependencies:
dependencies:
mime-db ">= 1.43.0 < 2"
mime-db ">= 1.43.0 < 2"
compression-webpack-plugin@^4.0.0:
version "4.0.0"
resolved "https://registry.npm.taobao.org/compression-webpack-plugin/download/compression-webpack-plugin-4.0.0.tgz#7599f592050002a49cd3ad3ee18ae7371e266bca"
integrity sha1-dZn1kgUAAqSc060+4YrnNx4ma8o=
dependencies:
cacache "^15.0.3"
find-cache-dir "^3.3.1"
schema-utils "^2.6.6"
serialize-javascript "^3.0.0"
webpack-sources "^1.4.3"
compression@^1.7.4:
compression@^1.7.4:
version "1.7.4"
version "1.7.4"
resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
...
@@ -3270,11 +3324,6 @@ core-js@^3.4.4:
...
@@ -3270,11 +3324,6 @@ core-js@^3.4.4:
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
core-js@^3.6.4:
version "3.6.5"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
core-util-is@1.0.2, core-util-is@~1.0.0:
core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2"
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
...
@@ -4039,18 +4088,6 @@ element-ui@^2.13.0:
...
@@ -4039,18 +4088,6 @@ element-ui@^2.13.0:
resize-observer-polyfill "^1.5.0"
resize-observer-polyfill "^1.5.0"
throttle-debounce "^1.0.1"
throttle-debounce "^1.0.1"
element-ui@^2.13.2:
version "2.13.2"
resolved "https://registry.yarnpkg.com/element-ui/-/element-ui-2.13.2.tgz#582bf47aaaaaafe23ea1958fae217a687ad06447"
integrity sha512-r761DRPssMPKDiJZWFlG+4e4vr0cRG/atKr3Eqr8Xi0tQMNbtmYU1QXvFnKiFPFFGkgJ6zS6ASkG+sellcoHlQ==
dependencies:
async-validator "~1.8.1"
babel-helper-vue-jsx-merge-props "^2.0.0"
deepmerge "^1.2.0"
normalize-wheel "^1.0.1"
resize-observer-polyfill "^1.5.0"
throttle-debounce "^1.0.1"
elliptic@^6.0.0:
elliptic@^6.0.0:
version "6.5.2"
version "6.5.2"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
...
@@ -4470,6 +4507,11 @@ fast-deep-equal@^2.0.1:
...
@@ -4470,6 +4507,11 @@ fast-deep-equal@^2.0.1:
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
fast-deep-equal@^3.1.1:
version "3.1.3"
resolved "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz?cache=0&sync_timestamp=1591599651635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-deep-equal%2Fdownload%2Ffast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
integrity sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=
fast-glob@^2.2.6:
fast-glob@^2.2.6:
version "2.2.7"
version "2.2.7"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
...
@@ -4619,6 +4661,15 @@ find-cache-dir@^3.0.0, find-cache-dir@^3.2.0:
...
@@ -4619,6 +4661,15 @@ find-cache-dir@^3.0.0, find-cache-dir@^3.2.0:
make-dir "^3.0.0"
make-dir "^3.0.0"
pkg-dir "^4.1.0"
pkg-dir "^4.1.0"
find-cache-dir@^3.3.1:
version "3.3.1"
resolved "https://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
integrity sha1-ibM/rUpGcNqpT4Vff74x1thP6IA=
dependencies:
commondir "^1.0.1"
make-dir "^3.0.2"
pkg-dir "^4.1.0"
find-up@^3.0.0:
find-up@^3.0.0:
version "3.0.0"
version "3.0.0"
resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
...
@@ -5249,16 +5300,10 @@ ibiz-gantt-elastic@^1.0.17:
...
@@ -5249,16 +5300,10 @@ ibiz-gantt-elastic@^1.0.17:
vue-slider-component "^3.0.40"
vue-slider-component "^3.0.40"
vue-switches "^2.0.1"
vue-switches "^2.0.1"
ibiz-vue-lib@^0.1.10:
ibiz-vue-lib@^0.1.13:
version "0.1.10"
version "0.1.13"
resolved "https://registry.npm.taobao.org/ibiz-vue-lib/download/ibiz-vue-lib-0.1.10.tgz#660f6f7fb73b5c63e3daa0921faf13c0cdc96de5"
resolved "https://registry.npm.taobao.org/ibiz-vue-lib/download/ibiz-vue-lib-0.1.13.tgz#f14e4316d800b79f9308685854b5a38aeeb5e129"
integrity sha1-Zg9vf7c7XGPj2qCSH68TwM3JbeU=
integrity sha1-8U5DFtgAt5+TCGhYVLWjiu614Sk=
dependencies:
axios "^0.19.2"
core-js "^3.6.4"
element-ui "^2.13.2"
view-design "^4.1.0"
vue "^2.6.11"
iconv-lite@0.4.24:
iconv-lite@0.4.24:
version "0.4.24"
version "0.4.24"
...
@@ -6734,6 +6779,13 @@ make-dir@^3.0.0:
...
@@ -6734,6 +6779,13 @@ make-dir@^3.0.0:
dependencies:
dependencies:
semver "^6.0.0"
semver "^6.0.0"
make-dir@^3.0.2:
version "3.1.0"
resolved "https://registry.npm.taobao.org/make-dir/download/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
integrity sha1-QV6WcEazp/HRhSd9hKpYIDcmoT8=
dependencies:
semver "^6.0.0"
make-error@1.x:
make-error@1.x:
version "1.3.5"
version "1.3.5"
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
...
@@ -6983,6 +7035,14 @@ minipass@^3.0.0, minipass@^3.1.1:
...
@@ -6983,6 +7035,14 @@ minipass@^3.0.0, minipass@^3.1.1:
dependencies:
dependencies:
yallist "^4.0.0"
yallist "^4.0.0"
minizlib@^2.1.0:
version "2.1.0"
resolved "https://registry.npm.taobao.org/minizlib/download/minizlib-2.1.0.tgz#fd52c645301ef09a63a2c209697c294c6ce02cf3"
integrity sha1-/VLGRTAe8JpjosIJaXwpTGzgLPM=
dependencies:
minipass "^3.0.0"
yallist "^4.0.0"
mississippi@^3.0.0:
mississippi@^3.0.0:
version "3.0.0"
version "3.0.0"
resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
...
@@ -7014,6 +7074,11 @@ mkdirp@0.5.1, mkdirp@0.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
...
@@ -7014,6 +7074,11 @@ mkdirp@0.5.1, mkdirp@0.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
dependencies:
dependencies:
minimist "0.0.8"
minimist "0.0.8"
mkdirp@^1.0.3, mkdirp@^1.0.4:
version "1.0.4"
resolved "https://registry.npm.taobao.org/mkdirp/download/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
integrity sha1-PrXtYmInVteaXw4qIh3+utdcL34=
mockjs@^1.1.0:
mockjs@^1.1.0:
version "1.1.0"
version "1.1.0"
resolved "https://registry.yarnpkg.com/mockjs/-/mockjs-1.1.0.tgz#e6a0c378e91906dbaff20911cc0273b3c7d75b06"
resolved "https://registry.yarnpkg.com/mockjs/-/mockjs-1.1.0.tgz#e6a0c378e91906dbaff20911cc0273b3c7d75b06"
...
@@ -7583,6 +7648,13 @@ p-map@^3.0.0:
...
@@ -7583,6 +7648,13 @@ p-map@^3.0.0:
dependencies:
dependencies:
aggregate-error "^3.0.0"
aggregate-error "^3.0.0"
p-map@^4.0.0:
version "4.0.0"
resolved "https://registry.npm.taobao.org/p-map/download/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
integrity sha1-uy+Vpe2i7BaOySdOBqdHw+KQTSs=
dependencies:
aggregate-error "^3.0.0"
p-reduce@^1.0.0:
p-reduce@^1.0.0:
version "1.0.0"
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
...
@@ -8398,7 +8470,7 @@ ramda@0.24.1:
...
@@ -8398,7 +8470,7 @@ ramda@0.24.1:
resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.24.1.tgz#c3b7755197f35b8dc3502228262c4c91ddb6b857"
resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.24.1.tgz#c3b7755197f35b8dc3502228262c4c91ddb6b857"
integrity sha1-w7d1UZfzW43DUCIoJixMkd22uFc=
integrity sha1-w7d1UZfzW43DUCIoJixMkd22uFc=
randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5
, randombytes@^2.1.0
:
version "2.1.0"
version "2.1.0"
resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
...
@@ -8756,6 +8828,13 @@ rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1:
...
@@ -8756,6 +8828,13 @@ rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1:
dependencies:
dependencies:
glob "^7.1.3"
glob "^7.1.3"
rimraf@^3.0.2:
version "3.0.2"
resolved "https://registry.npm.taobao.org/rimraf/download/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
integrity sha1-8aVAK6YiCtUswSgrrBrjqkn9Bho=
dependencies:
glob "^7.1.3"
ripemd160@^2.0.0, ripemd160@^2.0.1:
ripemd160@^2.0.0, ripemd160@^2.0.1:
version "2.0.2"
version "2.0.2"
resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
...
@@ -8856,6 +8935,15 @@ schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6
...
@@ -8856,6 +8935,15 @@ schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6
ajv "^6.10.2"
ajv "^6.10.2"
ajv-keywords "^3.4.1"
ajv-keywords "^3.4.1"
schema-utils@^2.6.6:
version "2.7.0"
resolved "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
integrity sha1-FxUfdtjq5n+793lgwzxnatn078c=
dependencies:
"@types/json-schema" "^7.0.4"
ajv "^6.12.2"
ajv-keywords "^3.4.1"
script-loader@^0.7.2:
script-loader@^0.7.2:
version "0.7.2"
version "0.7.2"
resolved "https://registry.yarnpkg.com/script-loader/-/script-loader-0.7.2.tgz#2016db6f86f25f5cf56da38915d83378bb166ba7"
resolved "https://registry.yarnpkg.com/script-loader/-/script-loader-0.7.2.tgz#2016db6f86f25f5cf56da38915d83378bb166ba7"
...
@@ -8914,6 +9002,13 @@ serialize-javascript@^2.1.2:
...
@@ -8914,6 +9002,13 @@ serialize-javascript@^2.1.2:
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
serialize-javascript@^3.0.0:
version "3.1.0"
resolved "https://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-3.1.0.tgz?cache=0&sync_timestamp=1591623621018&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
integrity sha1-i/OpFwcSZk7yVhtEtpHq/jmSFOo=
dependencies:
randombytes "^2.1.0"
serve-index@^1.9.1:
serve-index@^1.9.1:
version "1.9.1"
version "1.9.1"
resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
...
@@ -9250,6 +9345,13 @@ ssri@^7.0.0, ssri@^7.1.0:
...
@@ -9250,6 +9345,13 @@ ssri@^7.0.0, ssri@^7.1.0:
figgy-pudding "^3.5.1"
figgy-pudding "^3.5.1"
minipass "^3.1.1"
minipass "^3.1.1"
ssri@^8.0.0:
version "8.0.0"
resolved "https://registry.npm.taobao.org/ssri/download/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808"
integrity sha1-ecp04h+M6u3fy0uQFDxFi42YiAg=
dependencies:
minipass "^3.1.1"
stable@^0.1.8:
stable@^0.1.8:
version "0.1.8"
version "0.1.8"
resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
...
@@ -9533,6 +9635,18 @@ tapable@^1.0.0, tapable@^1.1.3:
...
@@ -9533,6 +9635,18 @@ tapable@^1.0.0, tapable@^1.1.3:
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
tar@^6.0.2:
version "6.0.2"
resolved "https://registry.npm.taobao.org/tar/download/tar-6.0.2.tgz#5df17813468a6264ff14f766886c622b84ae2f39"
integrity sha1-XfF4E0aKYmT/FPdmiGxiK4SuLzk=
dependencies:
chownr "^2.0.0"
fs-minipass "^2.0.0"
minipass "^3.0.0"
minizlib "^2.1.0"
mkdirp "^1.0.3"
yallist "^4.0.0"
terser-webpack-plugin@^1.4.3:
terser-webpack-plugin@^1.4.3:
version "1.4.3"
version "1.4.3"
resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
...
@@ -10230,7 +10344,7 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
...
@@ -10230,7 +10344,7 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
vue@^2.2.6, vue@^2.6.10
, vue@^2.6.11
:
vue@^2.2.6, vue@^2.6.10:
version "2.6.11"
version "2.6.11"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5"
integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==
integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUser.java
浏览文件 @
c332ffb0
...
@@ -68,6 +68,198 @@ public class SysUser extends EntityMP implements Serializable {
...
@@ -68,6 +68,198 @@ public class SysUser extends EntityMP implements Serializable {
@JSONField
(
name
=
"password"
)
@JSONField
(
name
=
"password"
)
@JsonProperty
(
"password"
)
@JsonProperty
(
"password"
)
private
String
password
;
private
String
password
;
/**
* 用户工号
*/
@TableField
(
value
=
"usercode"
)
@JSONField
(
name
=
"usercode"
)
@JsonProperty
(
"usercode"
)
private
String
usercode
;
/**
* 登录名
*/
@TableField
(
value
=
"loginname"
)
@JSONField
(
name
=
"loginname"
)
@JsonProperty
(
"loginname"
)
private
String
loginname
;
/**
* 区属
*/
@TableField
(
value
=
"domains"
)
@JSONField
(
name
=
"domains"
)
@JsonProperty
(
"domains"
)
private
String
domains
;
/**
* 主部门
*/
@TableField
(
value
=
"mdeptid"
)
@JSONField
(
name
=
"mdeptid"
)
@JsonProperty
(
"mdeptid"
)
private
String
mdeptid
;
/**
* 主部门代码
*/
@TableField
(
value
=
"mdeptcode"
)
@JSONField
(
name
=
"mdeptcode"
)
@JsonProperty
(
"mdeptcode"
)
private
String
mdeptcode
;
/**
* 主部门名称
*/
@TableField
(
value
=
"mdeptname"
)
@JSONField
(
name
=
"mdeptname"
)
@JsonProperty
(
"mdeptname"
)
private
String
mdeptname
;
/**
* 业务编码
*/
@TableField
(
value
=
"bcode"
)
@JSONField
(
name
=
"bcode"
)
@JsonProperty
(
"bcode"
)
private
String
bcode
;
/**
* 岗位标识
*/
@TableField
(
value
=
"postid"
)
@JSONField
(
name
=
"postid"
)
@JsonProperty
(
"postid"
)
private
String
postid
;
/**
* 岗位代码
*/
@TableField
(
value
=
"postcode"
)
@JSONField
(
name
=
"postcode"
)
@JsonProperty
(
"postcode"
)
private
String
postcode
;
/**
* 岗位名称
*/
@TableField
(
value
=
"postname"
)
@JSONField
(
name
=
"postname"
)
@JsonProperty
(
"postname"
)
private
String
postname
;
/**
* 单位
*/
@DEField
(
preType
=
DEPredefinedFieldType
.
ORGID
)
@TableField
(
value
=
"orgid"
)
@JSONField
(
name
=
"orgid"
)
@JsonProperty
(
"orgid"
)
private
String
orgid
;
/**
* 单位代码
*/
@TableField
(
value
=
"orgcode"
)
@JSONField
(
name
=
"orgcode"
)
@JsonProperty
(
"orgcode"
)
private
String
orgcode
;
/**
* 单位名称
*/
@DEField
(
preType
=
DEPredefinedFieldType
.
ORGNAME
)
@TableField
(
value
=
"orgname"
)
@JSONField
(
name
=
"orgname"
)
@JsonProperty
(
"orgname"
)
private
String
orgname
;
/**
* 昵称别名
*/
@TableField
(
value
=
"nickname"
)
@JSONField
(
name
=
"nickname"
)
@JsonProperty
(
"nickname"
)
private
String
nickname
;
/**
* 证件号码
*/
@TableField
(
value
=
"certcode"
)
@JSONField
(
name
=
"certcode"
)
@JsonProperty
(
"certcode"
)
private
String
certcode
;
/**
* 性别
*/
@TableField
(
value
=
"sex"
)
@JSONField
(
name
=
"sex"
)
@JsonProperty
(
"sex"
)
private
String
sex
;
/**
* 出生日期
*/
@TableField
(
value
=
"birthday"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
locale
=
"zh"
,
timezone
=
"GMT+8"
)
@JSONField
(
name
=
"birthday"
,
format
=
"yyyy-MM-dd"
)
@JsonProperty
(
"birthday"
)
private
Timestamp
birthday
;
/**
* 联系方式
*/
@TableField
(
value
=
"phone"
)
@JSONField
(
name
=
"phone"
)
@JsonProperty
(
"phone"
)
private
String
phone
;
/**
* 邮件
*/
@TableField
(
value
=
"email"
)
@JSONField
(
name
=
"email"
)
@JsonProperty
(
"email"
)
private
String
email
;
/**
* 社交账号
*/
@TableField
(
value
=
"avatar"
)
@JSONField
(
name
=
"avatar"
)
@JsonProperty
(
"avatar"
)
private
String
avatar
;
/**
* 地址
*/
@TableField
(
value
=
"addr"
)
@JSONField
(
name
=
"addr"
)
@JsonProperty
(
"addr"
)
private
String
addr
;
/**
* 照片
*/
@TableField
(
value
=
"usericon"
)
@JSONField
(
name
=
"usericon"
)
@JsonProperty
(
"usericon"
)
private
String
usericon
;
/**
* 样式
*/
@TableField
(
value
=
"theme"
)
@JSONField
(
name
=
"theme"
)
@JsonProperty
(
"theme"
)
private
String
theme
;
/**
* 语言
*/
@TableField
(
value
=
"lang"
)
@JSONField
(
name
=
"lang"
)
@JsonProperty
(
"lang"
)
private
String
lang
;
/**
* 字号
*/
@TableField
(
value
=
"fontsize"
)
@JSONField
(
name
=
"fontsize"
)
@JsonProperty
(
"fontsize"
)
private
String
fontsize
;
/**
* 备注
*/
@TableField
(
value
=
"memo"
)
@JSONField
(
name
=
"memo"
)
@JsonProperty
(
"memo"
)
private
String
memo
;
/**
* 保留
*/
@TableField
(
value
=
"reserver"
)
@JSONField
(
name
=
"reserver"
)
@JsonProperty
(
"reserver"
)
private
String
reserver
;
...
@@ -95,6 +287,216 @@ public class SysUser extends EntityMP implements Serializable {
...
@@ -95,6 +287,216 @@ public class SysUser extends EntityMP implements Serializable {
this
.
modify
(
"password"
,
password
);
this
.
modify
(
"password"
,
password
);
}
}
/**
* 设置 [用户工号]
*/
public
void
setUsercode
(
String
usercode
){
this
.
usercode
=
usercode
;
this
.
modify
(
"usercode"
,
usercode
);
}
/**
* 设置 [登录名]
*/
public
void
setLoginname
(
String
loginname
){
this
.
loginname
=
loginname
;
this
.
modify
(
"loginname"
,
loginname
);
}
/**
* 设置 [区属]
*/
public
void
setDomains
(
String
domains
){
this
.
domains
=
domains
;
this
.
modify
(
"domains"
,
domains
);
}
/**
* 设置 [主部门]
*/
public
void
setMdeptid
(
String
mdeptid
){
this
.
mdeptid
=
mdeptid
;
this
.
modify
(
"mdeptid"
,
mdeptid
);
}
/**
* 设置 [主部门代码]
*/
public
void
setMdeptcode
(
String
mdeptcode
){
this
.
mdeptcode
=
mdeptcode
;
this
.
modify
(
"mdeptcode"
,
mdeptcode
);
}
/**
* 设置 [主部门名称]
*/
public
void
setMdeptname
(
String
mdeptname
){
this
.
mdeptname
=
mdeptname
;
this
.
modify
(
"mdeptname"
,
mdeptname
);
}
/**
* 设置 [业务编码]
*/
public
void
setBcode
(
String
bcode
){
this
.
bcode
=
bcode
;
this
.
modify
(
"bcode"
,
bcode
);
}
/**
* 设置 [岗位标识]
*/
public
void
setPostid
(
String
postid
){
this
.
postid
=
postid
;
this
.
modify
(
"postid"
,
postid
);
}
/**
* 设置 [岗位代码]
*/
public
void
setPostcode
(
String
postcode
){
this
.
postcode
=
postcode
;
this
.
modify
(
"postcode"
,
postcode
);
}
/**
* 设置 [岗位名称]
*/
public
void
setPostname
(
String
postname
){
this
.
postname
=
postname
;
this
.
modify
(
"postname"
,
postname
);
}
/**
* 设置 [单位代码]
*/
public
void
setOrgcode
(
String
orgcode
){
this
.
orgcode
=
orgcode
;
this
.
modify
(
"orgcode"
,
orgcode
);
}
/**
* 设置 [昵称别名]
*/
public
void
setNickname
(
String
nickname
){
this
.
nickname
=
nickname
;
this
.
modify
(
"nickname"
,
nickname
);
}
/**
* 设置 [证件号码]
*/
public
void
setCertcode
(
String
certcode
){
this
.
certcode
=
certcode
;
this
.
modify
(
"certcode"
,
certcode
);
}
/**
* 设置 [性别]
*/
public
void
setSex
(
String
sex
){
this
.
sex
=
sex
;
this
.
modify
(
"sex"
,
sex
);
}
/**
* 设置 [出生日期]
*/
public
void
setBirthday
(
Timestamp
birthday
){
this
.
birthday
=
birthday
;
this
.
modify
(
"birthday"
,
birthday
);
}
/**
* 格式化日期 [出生日期]
*/
public
String
formatBirthday
(){
if
(
this
.
birthday
==
null
)
{
return
null
;
}
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
return
sdf
.
format
(
birthday
);
}
/**
* 设置 [联系方式]
*/
public
void
setPhone
(
String
phone
){
this
.
phone
=
phone
;
this
.
modify
(
"phone"
,
phone
);
}
/**
* 设置 [邮件]
*/
public
void
setEmail
(
String
email
){
this
.
email
=
email
;
this
.
modify
(
"email"
,
email
);
}
/**
* 设置 [社交账号]
*/
public
void
setAvatar
(
String
avatar
){
this
.
avatar
=
avatar
;
this
.
modify
(
"avatar"
,
avatar
);
}
/**
* 设置 [地址]
*/
public
void
setAddr
(
String
addr
){
this
.
addr
=
addr
;
this
.
modify
(
"addr"
,
addr
);
}
/**
* 设置 [照片]
*/
public
void
setUsericon
(
String
usericon
){
this
.
usericon
=
usericon
;
this
.
modify
(
"usericon"
,
usericon
);
}
/**
* 设置 [样式]
*/
public
void
setTheme
(
String
theme
){
this
.
theme
=
theme
;
this
.
modify
(
"theme"
,
theme
);
}
/**
* 设置 [语言]
*/
public
void
setLang
(
String
lang
){
this
.
lang
=
lang
;
this
.
modify
(
"lang"
,
lang
);
}
/**
* 设置 [字号]
*/
public
void
setFontsize
(
String
fontsize
){
this
.
fontsize
=
fontsize
;
this
.
modify
(
"fontsize"
,
fontsize
);
}
/**
* 设置 [备注]
*/
public
void
setMemo
(
String
memo
){
this
.
memo
=
memo
;
this
.
modify
(
"memo"
,
memo
);
}
/**
* 设置 [保留]
*/
public
void
setReserver
(
String
reserver
){
this
.
reserver
=
reserver
;
this
.
modify
(
"reserver"
,
reserver
);
}
}
}
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISysUserService.java
浏览文件 @
c332ffb0
...
@@ -56,6 +56,8 @@ public interface ISysUserService extends IService<SysUser>{
...
@@ -56,6 +56,8 @@ public interface ISysUserService extends IService<SysUser>{
*/
*/
boolean
execute
(
String
sql
,
Map
param
);
boolean
execute
(
String
sql
,
Map
param
);
List
<
SysUser
>
getSysuserByIds
(
List
<
String
>
ids
)
;
List
<
SysUser
>
getSysuserByEntities
(
List
<
SysUser
>
entities
)
;
}
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysUserServiceImpl.java
浏览文件 @
c332ffb0
...
@@ -184,6 +184,25 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
...
@@ -184,6 +184,25 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
return
true
;
return
true
;
}
}
@Override
public
List
<
SysUser
>
getSysuserByIds
(
List
<
String
>
ids
)
{
return
this
.
listByIds
(
ids
);
}
@Override
public
List
<
SysUser
>
getSysuserByEntities
(
List
<
SysUser
>
entities
)
{
List
ids
=
new
ArrayList
();
for
(
SysUser
entity
:
entities
){
Serializable
id
=
entity
.
getUserid
();
if
(!
ObjectUtils
.
isEmpty
(
id
)){
ids
.
add
(
id
);
}
}
if
(
ids
.
size
()>
0
)
return
this
.
listByIds
(
ids
);
else
return
entities
;
}
}
}
...
...
ibzuaa-core/src/main/resources/mapper/uaa/sysuser/SysUserMapper.xml
浏览文件 @
c332ffb0
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<!--数据查询[Default]-->
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"mysql"
>
<sql
id=
"Default"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`
PASSWORD`, t1.`PERSONNAME
`, t1.`USERID`, t1.`USERNAME` FROM `IBZUSER` t1
<![CDATA[ SELECT t1.`
ADDR`, t1.`AVATAR`, t1.`BCODE`, t1.`BIRTHDAY`, t1.`CERTCODE`, t1.`DOMAINS`, t1.`EMAIL`, t1.`FONTSIZE`, t1.`LANG`, t1.`LOGINNAME`, t1.`MDEPTCODE`, t1.`MDEPTID`, t1.`MDEPTNAME`, t1.`MEMO`, t1.`NICKNAME`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGNAME`, t1.`PASSWORD`, t1.`PERSONNAME`, t1.`PHONE`, t1.`POSTCODE`, t1.`POSTID`, t1.`POSTNAME`, t1.`RESERVER`, t1.`SEX`, t1.`THEME`, t1.`USERCODE`, t1.`USERICON
`, t1.`USERID`, t1.`USERNAME` FROM `IBZUSER` t1
]]>
]]>
</sql>
</sql>
<!--数据查询[Default]-->
<!--数据查询[Default]-->
...
...
ibzuaa-core/src/main/resources/permission/systemResource.json
浏览文件 @
c332ffb0
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
"sysmoudle"
:{
"id"
:
"UAA"
,
"name"
:
"uaa"
},
"sysmoudle"
:{
"id"
:
"UAA"
,
"name"
:
"uaa"
},
"dedataset"
:[{
"id"
:
"Default"
,
"name"
:
"DEFAULT"
}],
"dedataset"
:[{
"id"
:
"Default"
,
"name"
:
"DEFAULT"
}],
"deaction"
:[{
"id"
:
"Create"
,
"name"
:
"Create"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Update"
,
"name"
:
"Update"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Remove"
,
"name"
:
"Remove"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Get"
,
"name"
:
"Get"
,
"type"
:
"BUILTIN"
},{
"id"
:
"GetDraft"
,
"name"
:
"GetDraft"
,
"type"
:
"BUILTIN"
},{
"id"
:
"CheckKey"
,
"name"
:
"CheckKey"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Save"
,
"name"
:
"Save"
,
"type"
:
"BUILTIN"
}],
"deaction"
:[{
"id"
:
"Create"
,
"name"
:
"Create"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Update"
,
"name"
:
"Update"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Remove"
,
"name"
:
"Remove"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Get"
,
"name"
:
"Get"
,
"type"
:
"BUILTIN"
},{
"id"
:
"GetDraft"
,
"name"
:
"GetDraft"
,
"type"
:
"BUILTIN"
},{
"id"
:
"CheckKey"
,
"name"
:
"CheckKey"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Save"
,
"name"
:
"Save"
,
"type"
:
"BUILTIN"
}],
"datascope"
:[{
"id"
:
"all"
,
"name"
:
"全部数据"
}]
"datascope"
:[{
"id"
:
"all"
,
"name"
:
"全部数据"
}
,
{
"id"
:
"curorg"
,
"name"
:
"当前单位"
},{
"id"
:
"porg"
,
"name"
:
"上级单位"
},{
"id"
:
"sorg"
,
"name"
:
"下级单位"
}
]
}
}
,
{
,
{
"dename"
:
"SysRole"
,
"dename"
:
"SysRole"
,
...
...
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysUserDTO.java
浏览文件 @
c332ffb0
...
@@ -55,6 +55,223 @@ public class SysUserDTO extends DTOBase implements Serializable {
...
@@ -55,6 +55,223 @@ public class SysUserDTO extends DTOBase implements Serializable {
@JsonProperty
(
"password"
)
@JsonProperty
(
"password"
)
private
String
password
;
private
String
password
;
/**
* 属性 [USERCODE]
*
*/
@JSONField
(
name
=
"usercode"
)
@JsonProperty
(
"usercode"
)
private
String
usercode
;
/**
* 属性 [LOGINNAME]
*
*/
@JSONField
(
name
=
"loginname"
)
@JsonProperty
(
"loginname"
)
private
String
loginname
;
/**
* 属性 [DOMAINS]
*
*/
@JSONField
(
name
=
"domains"
)
@JsonProperty
(
"domains"
)
private
String
domains
;
/**
* 属性 [MDEPTID]
*
*/
@JSONField
(
name
=
"mdeptid"
)
@JsonProperty
(
"mdeptid"
)
private
String
mdeptid
;
/**
* 属性 [MDEPTCODE]
*
*/
@JSONField
(
name
=
"mdeptcode"
)
@JsonProperty
(
"mdeptcode"
)
private
String
mdeptcode
;
/**
* 属性 [MDEPTNAME]
*
*/
@JSONField
(
name
=
"mdeptname"
)
@JsonProperty
(
"mdeptname"
)
private
String
mdeptname
;
/**
* 属性 [BCODE]
*
*/
@JSONField
(
name
=
"bcode"
)
@JsonProperty
(
"bcode"
)
private
String
bcode
;
/**
* 属性 [POSTID]
*
*/
@JSONField
(
name
=
"postid"
)
@JsonProperty
(
"postid"
)
private
String
postid
;
/**
* 属性 [POSTCODE]
*
*/
@JSONField
(
name
=
"postcode"
)
@JsonProperty
(
"postcode"
)
private
String
postcode
;
/**
* 属性 [POSTNAME]
*
*/
@JSONField
(
name
=
"postname"
)
@JsonProperty
(
"postname"
)
private
String
postname
;
/**
* 属性 [ORGID]
*
*/
@JSONField
(
name
=
"orgid"
)
@JsonProperty
(
"orgid"
)
private
String
orgid
;
/**
* 属性 [ORGCODE]
*
*/
@JSONField
(
name
=
"orgcode"
)
@JsonProperty
(
"orgcode"
)
private
String
orgcode
;
/**
* 属性 [ORGNAME]
*
*/
@JSONField
(
name
=
"orgname"
)
@JsonProperty
(
"orgname"
)
private
String
orgname
;
/**
* 属性 [NICKNAME]
*
*/
@JSONField
(
name
=
"nickname"
)
@JsonProperty
(
"nickname"
)
private
String
nickname
;
/**
* 属性 [CERTCODE]
*
*/
@JSONField
(
name
=
"certcode"
)
@JsonProperty
(
"certcode"
)
private
String
certcode
;
/**
* 属性 [SEX]
*
*/
@JSONField
(
name
=
"sex"
)
@JsonProperty
(
"sex"
)
private
String
sex
;
/**
* 属性 [BIRTHDAY]
*
*/
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
locale
=
"zh"
,
timezone
=
"GMT+8"
)
@JSONField
(
name
=
"birthday"
,
format
=
"yyyy-MM-dd"
)
@JsonProperty
(
"birthday"
)
private
Timestamp
birthday
;
/**
* 属性 [PHONE]
*
*/
@JSONField
(
name
=
"phone"
)
@JsonProperty
(
"phone"
)
private
String
phone
;
/**
* 属性 [EMAIL]
*
*/
@JSONField
(
name
=
"email"
)
@JsonProperty
(
"email"
)
private
String
email
;
/**
* 属性 [AVATAR]
*
*/
@JSONField
(
name
=
"avatar"
)
@JsonProperty
(
"avatar"
)
private
String
avatar
;
/**
* 属性 [ADDR]
*
*/
@JSONField
(
name
=
"addr"
)
@JsonProperty
(
"addr"
)
private
String
addr
;
/**
* 属性 [USERICON]
*
*/
@JSONField
(
name
=
"usericon"
)
@JsonProperty
(
"usericon"
)
private
String
usericon
;
/**
* 属性 [THEME]
*
*/
@JSONField
(
name
=
"theme"
)
@JsonProperty
(
"theme"
)
private
String
theme
;
/**
* 属性 [LANG]
*
*/
@JSONField
(
name
=
"lang"
)
@JsonProperty
(
"lang"
)
private
String
lang
;
/**
* 属性 [FONTSIZE]
*
*/
@JSONField
(
name
=
"fontsize"
)
@JsonProperty
(
"fontsize"
)
private
String
fontsize
;
/**
* 属性 [MEMO]
*
*/
@JSONField
(
name
=
"memo"
)
@JsonProperty
(
"memo"
)
private
String
memo
;
/**
* 属性 [RESERVER]
*
*/
@JSONField
(
name
=
"reserver"
)
@JsonProperty
(
"reserver"
)
private
String
reserver
;
/**
/**
* 设置 [USERNAME]
* 设置 [USERNAME]
...
@@ -80,6 +297,206 @@ public class SysUserDTO extends DTOBase implements Serializable {
...
@@ -80,6 +297,206 @@ public class SysUserDTO extends DTOBase implements Serializable {
this
.
modify
(
"password"
,
password
);
this
.
modify
(
"password"
,
password
);
}
}
/**
* 设置 [USERCODE]
*/
public
void
setUsercode
(
String
usercode
){
this
.
usercode
=
usercode
;
this
.
modify
(
"usercode"
,
usercode
);
}
/**
* 设置 [LOGINNAME]
*/
public
void
setLoginname
(
String
loginname
){
this
.
loginname
=
loginname
;
this
.
modify
(
"loginname"
,
loginname
);
}
/**
* 设置 [DOMAINS]
*/
public
void
setDomains
(
String
domains
){
this
.
domains
=
domains
;
this
.
modify
(
"domains"
,
domains
);
}
/**
* 设置 [MDEPTID]
*/
public
void
setMdeptid
(
String
mdeptid
){
this
.
mdeptid
=
mdeptid
;
this
.
modify
(
"mdeptid"
,
mdeptid
);
}
/**
* 设置 [MDEPTCODE]
*/
public
void
setMdeptcode
(
String
mdeptcode
){
this
.
mdeptcode
=
mdeptcode
;
this
.
modify
(
"mdeptcode"
,
mdeptcode
);
}
/**
* 设置 [MDEPTNAME]
*/
public
void
setMdeptname
(
String
mdeptname
){
this
.
mdeptname
=
mdeptname
;
this
.
modify
(
"mdeptname"
,
mdeptname
);
}
/**
* 设置 [BCODE]
*/
public
void
setBcode
(
String
bcode
){
this
.
bcode
=
bcode
;
this
.
modify
(
"bcode"
,
bcode
);
}
/**
* 设置 [POSTID]
*/
public
void
setPostid
(
String
postid
){
this
.
postid
=
postid
;
this
.
modify
(
"postid"
,
postid
);
}
/**
* 设置 [POSTCODE]
*/
public
void
setPostcode
(
String
postcode
){
this
.
postcode
=
postcode
;
this
.
modify
(
"postcode"
,
postcode
);
}
/**
* 设置 [POSTNAME]
*/
public
void
setPostname
(
String
postname
){
this
.
postname
=
postname
;
this
.
modify
(
"postname"
,
postname
);
}
/**
* 设置 [ORGCODE]
*/
public
void
setOrgcode
(
String
orgcode
){
this
.
orgcode
=
orgcode
;
this
.
modify
(
"orgcode"
,
orgcode
);
}
/**
* 设置 [NICKNAME]
*/
public
void
setNickname
(
String
nickname
){
this
.
nickname
=
nickname
;
this
.
modify
(
"nickname"
,
nickname
);
}
/**
* 设置 [CERTCODE]
*/
public
void
setCertcode
(
String
certcode
){
this
.
certcode
=
certcode
;
this
.
modify
(
"certcode"
,
certcode
);
}
/**
* 设置 [SEX]
*/
public
void
setSex
(
String
sex
){
this
.
sex
=
sex
;
this
.
modify
(
"sex"
,
sex
);
}
/**
* 设置 [BIRTHDAY]
*/
public
void
setBirthday
(
Timestamp
birthday
){
this
.
birthday
=
birthday
;
this
.
modify
(
"birthday"
,
birthday
);
}
/**
* 设置 [PHONE]
*/
public
void
setPhone
(
String
phone
){
this
.
phone
=
phone
;
this
.
modify
(
"phone"
,
phone
);
}
/**
* 设置 [EMAIL]
*/
public
void
setEmail
(
String
email
){
this
.
email
=
email
;
this
.
modify
(
"email"
,
email
);
}
/**
* 设置 [AVATAR]
*/
public
void
setAvatar
(
String
avatar
){
this
.
avatar
=
avatar
;
this
.
modify
(
"avatar"
,
avatar
);
}
/**
* 设置 [ADDR]
*/
public
void
setAddr
(
String
addr
){
this
.
addr
=
addr
;
this
.
modify
(
"addr"
,
addr
);
}
/**
* 设置 [USERICON]
*/
public
void
setUsericon
(
String
usericon
){
this
.
usericon
=
usericon
;
this
.
modify
(
"usericon"
,
usericon
);
}
/**
* 设置 [THEME]
*/
public
void
setTheme
(
String
theme
){
this
.
theme
=
theme
;
this
.
modify
(
"theme"
,
theme
);
}
/**
* 设置 [LANG]
*/
public
void
setLang
(
String
lang
){
this
.
lang
=
lang
;
this
.
modify
(
"lang"
,
lang
);
}
/**
* 设置 [FONTSIZE]
*/
public
void
setFontsize
(
String
fontsize
){
this
.
fontsize
=
fontsize
;
this
.
modify
(
"fontsize"
,
fontsize
);
}
/**
* 设置 [MEMO]
*/
public
void
setMemo
(
String
memo
){
this
.
memo
=
memo
;
this
.
modify
(
"memo"
,
memo
);
}
/**
* 设置 [RESERVER]
*/
public
void
setReserver
(
String
reserver
){
this
.
reserver
=
reserver
;
this
.
modify
(
"reserver"
,
reserver
);
}
}
}
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SysUserResource.java
浏览文件 @
c332ffb0
...
@@ -47,7 +47,7 @@ public class SysUserResource {
...
@@ -47,7 +47,7 @@ public class SysUserResource {
@Lazy
@Lazy
public
SysUserMapping
sysuserMapping
;
public
SysUserMapping
sysuserMapping
;
@PreAuthorize
(
"has
AnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Create-all
')"
)
@PreAuthorize
(
"has
Permission(this.sysuserMapping.toDomain(#sysuserdto),'ibzuaa-SysUser-Create
')"
)
@ApiOperation
(
value
=
"新建系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"新建系统用户"
)
@ApiOperation
(
value
=
"新建系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"新建系统用户"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/sysusers"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/sysusers"
)
@Transactional
@Transactional
...
@@ -58,7 +58,7 @@ public class SysUserResource {
...
@@ -58,7 +58,7 @@ public class SysUserResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
}
@PreAuthorize
(
"has
AnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Create-all
')"
)
@PreAuthorize
(
"has
Permission(this.sysuserMapping.toDomain(#sysuserdtos),'ibzuaa-SysUser-Create
')"
)
@ApiOperation
(
value
=
"批量新建系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"批量新建系统用户"
)
@ApiOperation
(
value
=
"批量新建系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"批量新建系统用户"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/sysusers/batch"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/sysusers/batch"
)
public
ResponseEntity
<
Boolean
>
createBatch
(
@RequestBody
List
<
SysUserDTO
>
sysuserdtos
)
{
public
ResponseEntity
<
Boolean
>
createBatch
(
@RequestBody
List
<
SysUserDTO
>
sysuserdtos
)
{
...
@@ -66,7 +66,7 @@ public class SysUserResource {
...
@@ -66,7 +66,7 @@ public class SysUserResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
}
@PreAuthorize
(
"has
AnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Update-all
')"
)
@PreAuthorize
(
"has
Permission(this.sysuserService.get(#sysuser_id),'ibzuaa-SysUser-Update
')"
)
@ApiOperation
(
value
=
"更新系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"更新系统用户"
)
@ApiOperation
(
value
=
"更新系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"更新系统用户"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/sysusers/{sysuser_id}"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/sysusers/{sysuser_id}"
)
@Transactional
@Transactional
...
@@ -78,7 +78,7 @@ public class SysUserResource {
...
@@ -78,7 +78,7 @@ public class SysUserResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
}
@PreAuthorize
(
"has
AnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Update-all
')"
)
@PreAuthorize
(
"has
Permission(this.sysuserService.getSysuserByEntities(this.sysuserMapping.toDomain(#sysuserdtos)),'ibzuaa-SysUser-Update
')"
)
@ApiOperation
(
value
=
"批量更新系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"批量更新系统用户"
)
@ApiOperation
(
value
=
"批量更新系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"批量更新系统用户"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/sysusers/batch"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/sysusers/batch"
)
public
ResponseEntity
<
Boolean
>
updateBatch
(
@RequestBody
List
<
SysUserDTO
>
sysuserdtos
)
{
public
ResponseEntity
<
Boolean
>
updateBatch
(
@RequestBody
List
<
SysUserDTO
>
sysuserdtos
)
{
...
@@ -86,7 +86,7 @@ public class SysUserResource {
...
@@ -86,7 +86,7 @@ public class SysUserResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
}
@PreAuthorize
(
"has
AnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Remove-all
')"
)
@PreAuthorize
(
"has
Permission(this.sysuserService.get(#sysuser_id),'ibzuaa-SysUser-Remove
')"
)
@ApiOperation
(
value
=
"删除系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"删除系统用户"
)
@ApiOperation
(
value
=
"删除系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"删除系统用户"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/sysusers/{sysuser_id}"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/sysusers/{sysuser_id}"
)
@Transactional
@Transactional
...
@@ -94,7 +94,7 @@ public class SysUserResource {
...
@@ -94,7 +94,7 @@ public class SysUserResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
sysuserService
.
remove
(
sysuser_id
));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
sysuserService
.
remove
(
sysuser_id
));
}
}
@PreAuthorize
(
"has
AnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Remove-all
')"
)
@PreAuthorize
(
"has
Permission(this.sysuserService.getSysuserByIds(#ids),'ibzuaa-SysUser-Remove
')"
)
@ApiOperation
(
value
=
"批量删除系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"批量删除系统用户"
)
@ApiOperation
(
value
=
"批量删除系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"批量删除系统用户"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/sysusers/batch"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/sysusers/batch"
)
public
ResponseEntity
<
Boolean
>
removeBatch
(
@RequestBody
List
<
String
>
ids
)
{
public
ResponseEntity
<
Boolean
>
removeBatch
(
@RequestBody
List
<
String
>
ids
)
{
...
@@ -102,7 +102,7 @@ public class SysUserResource {
...
@@ -102,7 +102,7 @@ public class SysUserResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
}
@P
reAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Get-all
')"
)
@P
ostAuthorize
(
"hasPermission(this.sysuserMapping.toDomain(returnObject.body),'ibzuaa-SysUser-Get
')"
)
@ApiOperation
(
value
=
"获取系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"获取系统用户"
)
@ApiOperation
(
value
=
"获取系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"获取系统用户"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/sysusers/{sysuser_id}"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/sysusers/{sysuser_id}"
)
public
ResponseEntity
<
SysUserDTO
>
get
(
@PathVariable
(
"sysuser_id"
)
String
sysuser_id
)
{
public
ResponseEntity
<
SysUserDTO
>
get
(
@PathVariable
(
"sysuser_id"
)
String
sysuser_id
)
{
...
@@ -123,14 +123,14 @@ public class SysUserResource {
...
@@ -123,14 +123,14 @@ public class SysUserResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
sysuserService
.
checkKey
(
sysuserMapping
.
toDomain
(
sysuserdto
)));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
sysuserService
.
checkKey
(
sysuserMapping
.
toDomain
(
sysuserdto
)));
}
}
@PreAuthorize
(
"has
AnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Save-all
')"
)
@PreAuthorize
(
"has
Permission(this.sysuserMapping.toDomain(#sysuserdto),'ibzuaa-SysUser-Save
')"
)
@ApiOperation
(
value
=
"保存系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"保存系统用户"
)
@ApiOperation
(
value
=
"保存系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"保存系统用户"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/sysusers/save"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/sysusers/save"
)
public
ResponseEntity
<
Boolean
>
save
(
@RequestBody
SysUserDTO
sysuserdto
)
{
public
ResponseEntity
<
Boolean
>
save
(
@RequestBody
SysUserDTO
sysuserdto
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
sysuserService
.
save
(
sysuserMapping
.
toDomain
(
sysuserdto
)));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
sysuserService
.
save
(
sysuserMapping
.
toDomain
(
sysuserdto
)));
}
}
@PreAuthorize
(
"has
AnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Save-all
')"
)
@PreAuthorize
(
"has
Permission(this.sysuserMapping.toDomain(#sysuserdtos),'ibzuaa-SysUser-Save
')"
)
@ApiOperation
(
value
=
"批量保存系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"批量保存系统用户"
)
@ApiOperation
(
value
=
"批量保存系统用户"
,
tags
=
{
"系统用户"
},
notes
=
"批量保存系统用户"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/sysusers/savebatch"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/sysusers/savebatch"
)
public
ResponseEntity
<
Boolean
>
saveBatch
(
@RequestBody
List
<
SysUserDTO
>
sysuserdtos
)
{
public
ResponseEntity
<
Boolean
>
saveBatch
(
@RequestBody
List
<
SysUserDTO
>
sysuserdtos
)
{
...
@@ -138,7 +138,7 @@ public class SysUserResource {
...
@@ -138,7 +138,7 @@ public class SysUserResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-searchDefault-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-searchDefault-all')
and hasPermission(#context,'ibzuaa-SysUser-Get')
"
)
@ApiOperation
(
value
=
"获取DEFAULT"
,
tags
=
{
"系统用户"
}
,
notes
=
"获取DEFAULT"
)
@ApiOperation
(
value
=
"获取DEFAULT"
,
tags
=
{
"系统用户"
}
,
notes
=
"获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/sysusers/fetchdefault"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/sysusers/fetchdefault"
)
public
ResponseEntity
<
List
<
SysUserDTO
>>
fetchDefault
(
SysUserSearchContext
context
)
{
public
ResponseEntity
<
List
<
SysUserDTO
>>
fetchDefault
(
SysUserSearchContext
context
)
{
...
@@ -151,7 +151,7 @@ public class SysUserResource {
...
@@ -151,7 +151,7 @@ public class SysUserResource {
.
body
(
list
);
.
body
(
list
);
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-searchDefault-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-searchDefault-all')
and hasPermission(#context,'ibzuaa-SysUser-Get')
"
)
@ApiOperation
(
value
=
"查询DEFAULT"
,
tags
=
{
"系统用户"
}
,
notes
=
"查询DEFAULT"
)
@ApiOperation
(
value
=
"查询DEFAULT"
,
tags
=
{
"系统用户"
}
,
notes
=
"查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/sysusers/searchdefault"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/sysusers/searchdefault"
)
public
ResponseEntity
<
Page
<
SysUserDTO
>>
searchDefault
(
@RequestBody
SysUserSearchContext
context
)
{
public
ResponseEntity
<
Page
<
SysUserDTO
>>
searchDefault
(
@RequestBody
SysUserSearchContext
context
)
{
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录