Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzou
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzou
提交
74b5ee4c
提交
74b5ee4c
编写于
5月 26, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lab_qyk 发布系统代码
上级
fe75d00d
变更
10
展开全部
显示空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
122 行增加
和
613 行删除
+122
-613
main-form-base.vue
...eb/src/widgets/ibzdepartment/main-form/main-form-base.vue
+2
-2
new-form-form-base.vue
...idgets/ibzdepartment/new-form-form/new-form-form-base.vue
+2
-2
main-form-base.vue
app_web/src/widgets/ibzemployee/main-form/main-form-base.vue
+2
-2
new-form-form-base.vue
...gets/ibzorganization/new-form-form/new-form-form-base.vue
+1
-1
h2_table.xml
ibzou-core/src/main/resources/liquibase/h2_table.xml
+3
-3
IBZDepartmentResource.java
.../main/java/cn/ibizlab/api/rest/IBZDepartmentResource.java
+19
-22
IBZDeptMemberResource.java
.../main/java/cn/ibizlab/api/rest/IBZDeptMemberResource.java
+21
-30
IBZEmployeeResource.java
...rc/main/java/cn/ibizlab/api/rest/IBZEmployeeResource.java
+37
-44
IBZOrganizationResource.java
...ain/java/cn/ibizlab/api/rest/IBZOrganizationResource.java
+10
-11
AuthPermissionEvaluator.java
...ava/cn/ibizlab/util/security/AuthPermissionEvaluator.java
+25
-496
未找到文件。
app_web/src/widgets/ibzdepartment/main-form/main-form-base.vue
浏览文件 @
74b5ee4c
...
...
@@ -17,13 +17,13 @@
</i-col>
<i-col
v-show=
"detailsModel.pdeptname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'pdeptname'
:itemRules=
"this.rules.pdeptname"
class=
''
:caption=
"$t('entities.ibzdepartment.main_form.details.pdeptname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.pdeptname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-department-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'pdeptid','label':'pdeptname'}" filter="srforgid
" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-department-select>
<app-department-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
url=
"/ibzorganizations/$
{orgid}/ibzdepartments/picker" filter="srforgid" :fillMap="{'id':'pdeptid','label':'pdeptname'}
" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-department-select>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.orgname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'orgname'
:itemRules=
"this.rules.orgname"
class=
''
:caption=
"$t('entities.ibzdepartment.main_form.details.orgname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.orgname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-org-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'orgid','label':'orgname'}" filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-org-select>
<app-org-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'orgid','label':'orgname'}"
url="/ibzorganizations/${orgid}/suborg/picker"
filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-org-select>
</app-form-item>
</i-col>
...
...
app_web/src/widgets/ibzdepartment/new-form-form/new-form-form-base.vue
浏览文件 @
74b5ee4c
...
...
@@ -20,13 +20,13 @@
</i-col>
<i-col
v-show=
"detailsModel.orgname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'orgname'
:itemRules=
"this.rules.orgname"
class=
''
:caption=
"$t('entities.ibzdepartment.newform_form.details.orgname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.orgname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-org-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'orgid','label':'orgname'}" filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-org-select>
<app-org-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'orgid','label':'orgname'}"
url="/ibzorganizations/${orgid}/suborg/picker"
filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-org-select>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.pdeptname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'pdeptname'
:itemRules=
"this.rules.pdeptname"
class=
''
:caption=
"$t('entities.ibzdepartment.newform_form.details.pdeptname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.pdeptname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-department-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'pdeptid','label':'pdeptname'}" filter="srforgid
" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-department-select>
<app-department-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
url=
"/ibzorganizations/$
{orgid}/ibzdepartments/picker" filter="srforgid" :fillMap="{'id':'pdeptid','label':'pdeptname'}
" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-department-select>
</app-form-item>
</i-col>
...
...
app_web/src/widgets/ibzemployee/main-form/main-form-base.vue
浏览文件 @
74b5ee4c
...
...
@@ -29,13 +29,13 @@
<row>
<i-col
v-show=
"detailsModel.orgname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'orgname'
:itemRules=
"this.rules.orgname"
class=
''
:caption=
"$t('entities.ibzemployee.main_form.details.orgname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.orgname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-org-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{
id:'orgid','label':'orgname','code':'orgcode'}
" filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-org-select>
<app-org-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{
'id':'orgid','label':'orgname'}" url="/ibzorganizations/${orgid}/suborg/picker
" filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-org-select>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.mdeptname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'mdeptname'
:itemRules=
"this.rules.mdeptname"
class=
''
:caption=
"$t('entities.ibzemployee.main_form.details.mdeptname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.mdeptname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-department-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{id:'mdeptid','label':'mdeptname','code':'mdeptcode','bcode':'bcode'}" filter="orgid
" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-department-select>
<app-department-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
url=
"/ibzorganizations/$
{orgid}/ibzdepartments/picker" filter="srforgid" :fillMap="{'id':'mdeptid','label':'mdeptname'}
" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-department-select>
</app-form-item>
</i-col>
...
...
app_web/src/widgets/ibzorganization/new-form-form/new-form-form-base.vue
浏览文件 @
74b5ee4c
...
...
@@ -20,7 +20,7 @@
</i-col>
<i-col
v-show=
"detailsModel.porgname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'porgname'
:itemRules=
"this.rules.porgname"
class=
''
:caption=
"$t('entities.ibzorganization.newform_form.details.porgname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.porgname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-org-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'porgid','label':'porgname'}" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-org-select>
<app-org-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'porgid','label':'porgname'}"
url="/ibzorganizations/alls/suborg/picker" filter="srforgid"
:multiple="false" style="" @select-change="onFormItemValueChange">
</app-org-select>
</app-form-item>
</i-col>
...
...
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
74b5ee4c
...
...
@@ -126,7 +126,7 @@
<!--输出实体[IBZDEPT]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzdept-6
28
-4"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzdept-6
34
-4"
>
<createTable
tableName=
"IBZDEPT"
>
<column
name=
"DEPTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_IBZDEPT_DEPTID"
/>
...
...
@@ -179,10 +179,10 @@
<addForeignKeyConstraint
baseColumnNames=
"USERID"
baseTableName=
"IBZDEPTMEMBER"
constraintName=
"DER1N_IBZDEPTMEMBER_IBZEMP_USE"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"USERID"
referencedTableName=
"IBZEMP"
validate=
"true"
/>
</changeSet>
<!--输出实体[IBZDEPT]外键关系 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-6
28
-10"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-6
34
-10"
>
<addForeignKeyConstraint
baseColumnNames=
"PDEPTID"
baseTableName=
"IBZDEPT"
constraintName=
"DER1N_IBZDEPT_IBZDEPT_PDEPTID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"DEPTID"
referencedTableName=
"IBZDEPT"
validate=
"true"
/>
</changeSet>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-6
28
-11"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-6
34
-11"
>
<addForeignKeyConstraint
baseColumnNames=
"ORGID"
baseTableName=
"IBZDEPT"
constraintName=
"DER1N_IBZDEPT_IBZORG_ORGID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGID"
referencedTableName=
"IBZORG"
validate=
"true"
/>
</changeSet>
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDepartmentResource.java
浏览文件 @
74b5ee4c
此差异已折叠。
点击以展开。
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDeptMemberResource.java
浏览文件 @
74b5ee4c
此差异已折叠。
点击以展开。
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZEmployeeResource.java
浏览文件 @
74b5ee4c
此差异已折叠。
点击以展开。
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZOrganizationResource.java
浏览文件 @
74b5ee4c
...
...
@@ -22,6 +22,7 @@ import org.springframework.data.domain.Pageable;
import
org.springframework.util.StringUtils
;
import
org.springframework.context.annotation.Lazy
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.security.access.prepost.PostAuthorize
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiResponse
;
...
...
@@ -47,14 +48,13 @@ public class IBZOrganizationResource {
public
IBZOrganizationDTO
permissionDTO
=
new
IBZOrganizationDTO
();
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZOrganization-CheckKey-all')"
)
@ApiOperation
(
value
=
"CheckKey"
,
tags
=
{
"IBZOrganization"
},
notes
=
"CheckKey"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/checkkey"
)
public
ResponseEntity
<
Boolean
>
checkKey
(
@RequestBody
IBZOrganizationDTO
ibzorganizationdto
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzorganizationService
.
checkKey
(
ibzorganizationMapping
.
toDomain
(
ibzorganizationdto
)));
}
@PreAuthorize
(
"hasPermission(#ibzorganization_id,'Update',{'Sql',this.ibzorganizationMapping,#ibzorganizationdto}
)"
)
//@PreAuthorize("hasPermission(this.ibzorganizationService.get(#ibzorganization_id),'ibzou-IBZOrganization-Update'
)")
@ApiOperation
(
value
=
"Update"
,
tags
=
{
"IBZOrganization"
},
notes
=
"Update"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzorganizations/{ibzorganization_id}"
)
@Transactional
...
...
@@ -66,7 +66,7 @@ public class IBZOrganizationResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
@PreAuthorize
(
"hasPermission('Update',{'Sql',this.ibzorganizationMapping,#ibzorganizationdtos})"
)
//
@PreAuthorize("hasPermission('Update',{'Sql',this.ibzorganizationMapping,#ibzorganizationdtos})")
@ApiOperation
(
value
=
"UpdateBatch"
,
tags
=
{
"IBZOrganization"
},
notes
=
"UpdateBatch"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzorganizations/batch"
)
public
ResponseEntity
<
Boolean
>
updateBatch
(
@RequestBody
List
<
IBZOrganizationDTO
>
ibzorganizationdtos
)
{
...
...
@@ -74,7 +74,7 @@ public class IBZOrganizationResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasPermission('','Create',{'Sql',this.ibzorganizationMapping,#ibzorganizationdto}
)"
)
//@PreAuthorize("hasPermission(this.ibzorganizationMapping.toDomain(#ibzorganizationdtos),'ibzou-IBZOrganization-Create'
)")
@ApiOperation
(
value
=
"Create"
,
tags
=
{
"IBZOrganization"
},
notes
=
"Create"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations"
)
@Transactional
...
...
@@ -85,7 +85,7 @@ public class IBZOrganizationResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
@PreAuthorize
(
"hasPermission('Create',{'Sql',this.ibzorganizationMapping,#ibzorganizationdtos})"
)
//
@PreAuthorize("hasPermission('Create',{'Sql',this.ibzorganizationMapping,#ibzorganizationdtos})")
@ApiOperation
(
value
=
"createBatch"
,
tags
=
{
"IBZOrganization"
},
notes
=
"createBatch"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/batch"
)
public
ResponseEntity
<
Boolean
>
createBatch
(
@RequestBody
List
<
IBZOrganizationDTO
>
ibzorganizationdtos
)
{
...
...
@@ -93,14 +93,14 @@ public class IBZOrganizationResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasPermission('','Save',{'Sql',this.ibzorganizationMapping,#ibzorganizationdto})"
)
//
@PreAuthorize("hasPermission('','Save',{'Sql',this.ibzorganizationMapping,#ibzorganizationdto})")
@ApiOperation
(
value
=
"Save"
,
tags
=
{
"IBZOrganization"
},
notes
=
"Save"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/save"
)
public
ResponseEntity
<
Boolean
>
save
(
@RequestBody
IBZOrganizationDTO
ibzorganizationdto
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzorganizationService
.
save
(
ibzorganizationMapping
.
toDomain
(
ibzorganizationdto
)));
}
@PreAuthorize
(
"hasPermission('Save',{'Sql',this.ibzorganizationMapping,#ibzorganizationdtos})"
)
//
@PreAuthorize("hasPermission('Save',{'Sql',this.ibzorganizationMapping,#ibzorganizationdtos})")
@ApiOperation
(
value
=
"SaveBatch"
,
tags
=
{
"IBZOrganization"
},
notes
=
"SaveBatch"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/savebatch"
)
public
ResponseEntity
<
Boolean
>
saveBatch
(
@RequestBody
List
<
IBZOrganizationDTO
>
ibzorganizationdtos
)
{
...
...
@@ -108,7 +108,7 @@ public class IBZOrganizationResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasPermission(#ibzorganization_id,'Remove',{'Sql',this.ibzorganizationMapping,this.permissionDTO}
)"
)
//@PreAuthorize("hasPermission(this.ibzorganizationService.get(#ibzorganization_id),'ibzou-IBZOrganization-Remove'
)")
@ApiOperation
(
value
=
"Remove"
,
tags
=
{
"IBZOrganization"
},
notes
=
"Remove"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/ibzorganizations/{ibzorganization_id}"
)
@Transactional
...
...
@@ -116,7 +116,7 @@ public class IBZOrganizationResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzorganizationService
.
remove
(
ibzorganization_id
));
}
@PreAuthorize
(
"hasPermission('Remove',{'Sql',this.ibzorganizationMapping,this.permissionDTO,#ids})"
)
//
@PreAuthorize("hasPermission('Remove',{'Sql',this.ibzorganizationMapping,this.permissionDTO,#ids})")
@ApiOperation
(
value
=
"RemoveBatch"
,
tags
=
{
"IBZOrganization"
},
notes
=
"RemoveBatch"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/ibzorganizations/batch"
)
public
ResponseEntity
<
Boolean
>
removeBatch
(
@RequestBody
List
<
String
>
ids
)
{
...
...
@@ -124,7 +124,7 @@ public class IBZOrganizationResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@P
reAuthorize
(
"hasPermission(#ibzorganization_id,'Get',{'Sql',this.ibzorganizationMapping,this.permissionDTO}
)"
)
@P
ostAuthorize
(
"hasPermission(this.ibzorganizationMapping.toDomain(returnObject.body),'ibzou-IBZOrganization-Get'
)"
)
@ApiOperation
(
value
=
"Get"
,
tags
=
{
"IBZOrganization"
},
notes
=
"Get"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzorganizations/{ibzorganization_id}"
)
public
ResponseEntity
<
IBZOrganizationDTO
>
get
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
)
{
...
...
@@ -133,7 +133,6 @@ public class IBZOrganizationResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZOrganization-GetDraft-all')"
)
@ApiOperation
(
value
=
"GetDraft"
,
tags
=
{
"IBZOrganization"
},
notes
=
"GetDraft"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzorganizations/getdraft"
)
public
ResponseEntity
<
IBZOrganizationDTO
>
getDraft
()
{
...
...
ibzou-util/src/main/java/cn/ibizlab/util/security/AuthPermissionEvaluator.java
浏览文件 @
74b5ee4c
此差异已折叠。
点击以展开。
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录