Skip to content

I
ibzou
提交 c0af3241 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 e289f518
隐藏空白字符变更
内嵌 并排
正在显示 包含 573 行增加 和 46 行删除
app_web/src/components/app-dashboard-design/app-dashboard-design-service.ts
浏览文件 @ c0af3241
......@@ -65,14 +65,21 @@ export default class AppDashboardDesignService {
public loadPortletList(context: any, viewparams: any): Promise<any> {
return new Promise((resolve: any, reject: any) => {
Http.getInstance().get('./assets/json/portlet-data.json').then((response: any) => {
if (response && response.status === 200 && response.data && Array.isArray(response.data)) {
const datas: any[] = this.filterData(response.data, viewparams.appdeName);
if (response && response.status === 200 && response.data) {
let result:Array<any> = [];
if(typeof(response.data)=='string'){
const index:number = response.data.lastIndexOf(",");
result = JSON.parse((response.data).slice(0,index)+']');
}else{
result = response.data;
}
const datas: any[] = this.filterData(result, viewparams.appdeName);
const list = this.prepareList(datas);
const groups = this.prepareGroup(datas);
resolve({data: datas, result: list.reverse(), groups: groups});
}
}).catch((response: any) => {
console.log(response.status);
console.log(response);
});
});
}
......
app_web/src/locale/lanres/entities/ibzdepartment/ibzdepartment_en_US.ts
浏览文件 @ c0af3241
......@@ -8,6 +8,7 @@ export default {
parentdeptid: '上级部门',
shortname: '部门简称',
deptlevel: '部门级别',
domains: '区属',
showorder: '排序',
bcode: '业务编码',
leaderid: '分管领导标识',
......
app_web/src/locale/lanres/entities/ibzdepartment/ibzdepartment_zh_CN.ts
浏览文件 @ c0af3241
......@@ -7,6 +7,7 @@ export default {
parentdeptid: '上级部门',
shortname: '部门简称',
deptlevel: '部门级别',
domains: '区属',
showorder: '排序',
bcode: '业务编码',
leaderid: '分管领导标识',
......
app_web/src/locale/lanres/entities/ibzdept-member/ibzdept-member_en_US.ts
浏览文件 @ c0af3241
......@@ -6,6 +6,9 @@ export default {
deptname: '部门名称',
userid: '用户标识',
personname: '成员',
postid: '岗位标识',
postname: '岗位名称',
domains: '区属',
},
views: {
editview: {
......
app_web/src/locale/lanres/entities/ibzdept-member/ibzdept-member_zh_CN.ts
浏览文件 @ c0af3241
......@@ -5,6 +5,9 @@ export default {
deptname: '部门名称',
userid: '用户标识',
personname: '成员',
postid: '岗位标识',
postname: '岗位名称',
domains: '区属',
},
views: {
editview: {
......
app_web/src/locale/lanres/entities/ibzorganization/ibzorganization_en_US.ts
浏览文件 @ c0af3241
......@@ -9,6 +9,7 @@ export default {
orglevel: '单位级别',
showorder: '排序',
parentorgname: '上级单位',
domains: '区属',
enable: '逻辑有效',
createdate: '创建时间',
updatedate: '最后修改时间',
......
app_web/src/locale/lanres/entities/ibzorganization/ibzorganization_zh_CN.ts
浏览文件 @ c0af3241
......@@ -8,6 +8,7 @@ export default {
orglevel: '单位级别',
showorder: '排序',
parentorgname: '上级单位',
domains: '区属',
enable: '逻辑有效',
createdate: '创建时间',
updatedate: '最后修改时间',
......
app_web/src/locale/lanres/entities/ibzteam-member/ibzteam-member_en_US.ts
浏览文件 @ c0af3241
......@@ -6,5 +6,8 @@ export default {
teamname: '组名称',
userid: '用户标识',
personname: '姓名',
postid: '岗位标识',
postname: '岗位标识',
domains: '区属',
},
};
\ No newline at end of file
app_web/src/locale/lanres/entities/ibzteam-member/ibzteam-member_zh_CN.ts
浏览文件 @ c0af3241
......@@ -5,5 +5,8 @@ export default {
teamname: '组名称',
userid: '用户标识',
personname: '姓名',
postid: '岗位标识',
postname: '岗位标识',
domains: '区属',
},
};
\ No newline at end of file
app_web/src/locale/lanres/entities/ibzteam/ibzteam_en_US.ts
浏览文件 @ c0af3241
......@@ -3,5 +3,7 @@ export default {
fields: {
teamid: '组标识',
teamname: '组名称',
memo: '备注',
domains: '区属',
},
};
\ No newline at end of file
app_web/src/locale/lanres/entities/ibzteam/ibzteam_zh_CN.ts
浏览文件 @ c0af3241
......@@ -2,5 +2,7 @@ export default {
fields: {
teamid: '组标识',
teamname: '组名称',
memo: '备注',
domains: '区属',
},
};
\ No newline at end of file
app_web/src/widgets/ibzdepartment/dept-tree-treeview/dept-tree-treeview-model.ts
浏览文件 @ c0af3241
......@@ -36,6 +36,9 @@ export default class DeptTreeModel {
{
name: 'deptlevel',
},
{
name: 'domains',
},
{
name: 'showorder',
},
......
app_web/src/widgets/ibzdepartment/edit-grid-grid/edit-grid-grid-base.vue
浏览文件 @ c0af3241
......@@ -96,7 +96,8 @@
<template v-slot="{row,column,$index}">
<template v-if="actualIsOpenEdit">
<app-form-item :error="gridItemsModel[$index][column.property].error">
<app-picker
<app-picker
:formState="viewState"
:data="row"
:context="context"
......
app_web/src/widgets/ibzdepartment/main-form/main-form-base.vue
浏览文件 @ c0af3241
......@@ -47,7 +47,8 @@
</i-col>
<i-col v-show="detailsModel.leadername.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='leadername' :itemRules="this.rules.leadername" class='' :caption="$t('entities.ibzdepartment.main_form.details.leadername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.leadername.error" :isEmptyCaption="false" labelPos="LEFT">
<ibiz-group-select
<ibiz-group-select
name="leadername"
:value='data.leadername'
valueitem="leaderid"
......
app_web/src/widgets/ibzdepartment/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ c0af3241
......@@ -36,6 +36,9 @@ export default class MPickupViewpickupviewpanelModel {
{
name: 'deptlevel',
},
{
name: 'domains',
},
{
name: 'showorder',
},
......
app_web/src/widgets/ibzdepartment/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ c0af3241
......@@ -36,6 +36,9 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'deptlevel',
},
{
name: 'domains',
},
{
name: 'showorder',
},
......
app_web/src/widgets/ibzdepartment/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-model.ts
浏览文件 @ c0af3241
......@@ -36,6 +36,9 @@ export default class TreeExpViewtreeexpbarModel {
{
name: 'deptlevel',
},
{
name: 'domains',
},
{
name: 'showorder',
},
......
app_web/src/widgets/ibzdept-member/main-form/main-form-base.vue
浏览文件 @ c0af3241
......@@ -8,7 +8,8 @@
<row>
<i-col v-show="detailsModel.deptname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='deptname' :itemRules="this.rules.deptname" class='' :caption="$t('entities.ibzdeptmember.main_form.details.deptname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.deptname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-picker
<app-picker
:formState="formState"
:data="data"
:context="context"
......@@ -33,7 +34,8 @@
</i-col>
<i-col v-show="detailsModel.personname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='personname' :itemRules="this.rules.personname" class='' :caption="$t('entities.ibzdeptmember.main_form.details.personname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.personname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-picker
<app-picker
:formState="formState"
:data="data"
:context="context"
......
app_web/src/widgets/ibzdept-member/main-grid/main-grid-model.ts
浏览文件 @ c0af3241
......@@ -26,6 +26,11 @@ export default class MainModel {
]
}else{
return [
{
name: 'postid',
prop: 'postid',
dataType: 'PICKUP',
},
{
name: 'deptid',
prop: 'deptid',
......
app_web/src/widgets/ibzemployee/edit-grid-grid/edit-grid-grid-base.vue
浏览文件 @ c0af3241
......@@ -123,7 +123,8 @@
<template v-slot="{row,column,$index}">
<template v-if="actualIsOpenEdit">
<app-form-item :error="gridItemsModel[$index][column.property].error">
<app-picker
<app-picker
:formState="viewState"
:data="row"
:context="context"
......@@ -173,7 +174,8 @@
<template v-slot="{row,column,$index}">
<template v-if="actualIsOpenEdit">
<app-form-item :error="gridItemsModel[$index][column.property].error">
<app-picker
<app-picker
:formState="viewState"
:data="row"
:context="context"
......
app_web/src/widgets/ibzorganization/org-tree-treeview/org-tree-treeview-model.ts
浏览文件 @ c0af3241
......@@ -39,6 +39,9 @@ export default class OrgTreeModel {
{
name: 'parentorgname',
},
{
name: 'domains',
},
{
name: 'enable',
},
......
app_web/src/widgets/ibzorganization/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ c0af3241
......@@ -39,6 +39,9 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'parentorgname',
},
{
name: 'domains',
},
{
name: 'enable',
},
......
app_web/src/widgets/ibzorganization/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-model.ts
浏览文件 @ c0af3241
......@@ -39,6 +39,9 @@ export default class TreeExpViewtreeexpbarModel {
{
name: 'parentorgname',
},
{
name: 'domains',
},
{
name: 'enable',
},
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZDepartment.java
浏览文件 @ c0af3241
......@@ -90,6 +90,13 @@ public class IBZDepartment extends EntityMP implements Serializable {
@JSONField(name = "deptlevel")
@JsonProperty("deptlevel")
private Integer deptlevel;
/**
* 区属
*/
@TableField(value = "domains")
@JSONField(name = "domains")
@JsonProperty("domains")
private String domains;
/**
* 排序
*/
......@@ -213,6 +220,13 @@ public class IBZDepartment extends EntityMP implements Serializable {
this.deptlevel = deptlevel ;
this.modify("deptlevel",deptlevel);
}
/**
* 设置 [区属]
*/
public void setDomains(String domains){
this.domains = domains ;
this.modify("domains",domains);
}
/**
* 设置 [排序]
*/
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZDeptMember.java
浏览文件 @ c0af3241
......@@ -74,6 +74,27 @@ public class IBZDeptMember extends EntityMP implements Serializable {
@JSONField(name = "personname")
@JsonProperty("personname")
private String personname;
/**
* 岗位标识
*/
@TableField(value = "postid")
@JSONField(name = "postid")
@JsonProperty("postid")
private String postid;
/**
* 岗位名称
*/
@TableField(exist = false)
@JSONField(name = "postname")
@JsonProperty("postname")
private String postname;
/**
* 区属
*/
@TableField(value = "domains")
@JSONField(name = "domains")
@JsonProperty("domains")
private String domains;
/**
* 部门
......@@ -91,6 +112,14 @@ public class IBZDeptMember extends EntityMP implements Serializable {
@TableField(exist = false)
private cn.ibizlab.core.ou.domain.IBZEmployee emp;
/**
* 岗位
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.core.ou.domain.IBZPost post;
/**
......@@ -107,6 +136,20 @@ public class IBZDeptMember extends EntityMP implements Serializable {
this.userid = userid ;
this.modify("userid",userid);
}
/**
* 设置 [岗位标识]
*/
public void setPostid(String postid){
this.postid = postid ;
this.modify("postid",postid);
}
/**
* 设置 [区属]
*/
public void setDomains(String domains){
this.domains = domains ;
this.modify("domains",domains);
}
/**
* 获取 [标识]
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZOrganization.java
浏览文件 @ c0af3241
......@@ -97,6 +97,13 @@ public class IBZOrganization extends EntityMP implements Serializable {
@JSONField(name = "parentorgname")
@JsonProperty("parentorgname")
private String parentorgname;
/**
* 区属
*/
@TableField(value = "domains")
@JSONField(name = "domains")
@JsonProperty("domains")
private String domains;
/**
* 逻辑有效
*/
......@@ -178,6 +185,13 @@ public class IBZOrganization extends EntityMP implements Serializable {
this.showorder = showorder ;
this.modify("showorder",showorder);
}
/**
* 设置 [区属]
*/
public void setDomains(String domains){
this.domains = domains ;
this.modify("domains",domains);
}
}
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZPost.java
浏览文件 @ c0af3241
......@@ -60,6 +60,20 @@ public class IBZPost extends EntityMP implements Serializable {
@JSONField(name = "postname")
@JsonProperty("postname")
private String postname;
/**
* 区属
*/
@TableField(value = "domains")
@JSONField(name = "domains")
@JsonProperty("domains")
private String domains;
/**
* 备注
*/
@TableField(value = "memo")
@JSONField(name = "memo")
@JsonProperty("memo")
private String memo;
......@@ -77,6 +91,20 @@ public class IBZPost extends EntityMP implements Serializable {
this.postname = postname ;
this.modify("postname",postname);
}
/**
* 设置 [区属]
*/
public void setDomains(String domains){
this.domains = domains ;
this.modify("domains",domains);
}
/**
* 设置 [备注]
*/
public void setMemo(String memo){
this.memo = memo ;
this.modify("memo",memo);
}
}
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZTeam.java
浏览文件 @ c0af3241
......@@ -53,6 +53,20 @@ public class IBZTeam extends EntityMP implements Serializable {
@JSONField(name = "teamname")
@JsonProperty("teamname")
private String teamname;
/**
* 备注
*/
@TableField(value = "memo")
@JSONField(name = "memo")
@JsonProperty("memo")
private String memo;
/**
* 区属
*/
@TableField(value = "domains")
@JSONField(name = "domains")
@JsonProperty("domains")
private String domains;
......@@ -63,6 +77,20 @@ public class IBZTeam extends EntityMP implements Serializable {
this.teamname = teamname ;
this.modify("teamname",teamname);
}
/**
* 设置 [备注]
*/
public void setMemo(String memo){
this.memo = memo ;
this.modify("memo",memo);
}
/**
* 设置 [区属]
*/
public void setDomains(String domains){
this.domains = domains ;
this.modify("domains",domains);
}
}
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZTeamMember.java
浏览文件 @ c0af3241
......@@ -74,6 +74,27 @@ public class IBZTeamMember extends EntityMP implements Serializable {
@JSONField(name = "personname")
@JsonProperty("personname")
private String personname;
/**
* 岗位标识
*/
@TableField(value = "postid")
@JSONField(name = "postid")
@JsonProperty("postid")
private String postid;
/**
* 岗位标识
*/
@TableField(exist = false)
@JSONField(name = "postname")
@JsonProperty("postname")
private String postname;
/**
* 区属
*/
@TableField(value = "domains")
@JSONField(name = "domains")
@JsonProperty("domains")
private String domains;
/**
*
......@@ -83,6 +104,14 @@ public class IBZTeamMember extends EntityMP implements Serializable {
@TableField(exist = false)
private cn.ibizlab.core.ou.domain.IBZEmployee emp;
/**
* 岗位
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.core.ou.domain.IBZPost post;
/**
*
*/
......@@ -107,6 +136,20 @@ public class IBZTeamMember extends EntityMP implements Serializable {
this.userid = userid ;
this.modify("userid",userid);
}
/**
* 设置 [岗位标识]
*/
public void setPostid(String postid){
this.postid = postid ;
this.modify("postid",postid);
}
/**
* 设置 [区属]
*/
public void setDomains(String domains){
this.domains = domains ;
this.modify("domains",domains);
}
/**
* 获取 [组成员标识]
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZDeptMemberSearchContext.java
浏览文件 @ c0af3241
......@@ -69,6 +69,27 @@ public class IBZDeptMemberSearchContext extends QueryWrapperContext<IBZDeptMembe
this.getSelectCond().like("personname", n_personname_like);
}
}
private String n_postid_eq;//[岗位标识]
public void setN_postid_eq(String n_postid_eq) {
this.n_postid_eq = n_postid_eq;
if(!ObjectUtils.isEmpty(this.n_postid_eq)){
this.getSelectCond().eq("postid", n_postid_eq);
}
}
private String n_postname_eq;//[岗位名称]
public void setN_postname_eq(String n_postname_eq) {
this.n_postname_eq = n_postname_eq;
if(!ObjectUtils.isEmpty(this.n_postname_eq)){
this.getSelectCond().eq("postname", n_postname_eq);
}
}
private String n_postname_like;//[岗位名称]
public void setN_postname_like(String n_postname_like) {
this.n_postname_like = n_postname_like;
if(!ObjectUtils.isEmpty(this.n_postname_like)){
this.getSelectCond().like("postname", n_postname_like);
}
}
/**
* 启用快速搜索
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZTeamMemberSearchContext.java
浏览文件 @ c0af3241
......@@ -76,6 +76,27 @@ public class IBZTeamMemberSearchContext extends QueryWrapperContext<IBZTeamMembe
this.getSelectCond().like("personname", n_personname_like);
}
}
private String n_postid_eq;//[岗位标识]
public void setN_postid_eq(String n_postid_eq) {
this.n_postid_eq = n_postid_eq;
if(!ObjectUtils.isEmpty(this.n_postid_eq)){
this.getSelectCond().eq("postid", n_postid_eq);
}
}
private String n_postname_eq;//[岗位标识]
public void setN_postname_eq(String n_postname_eq) {
this.n_postname_eq = n_postname_eq;
if(!ObjectUtils.isEmpty(this.n_postname_eq)){
this.getSelectCond().eq("postname", n_postname_eq);
}
}
private String n_postname_like;//[岗位标识]
public void setN_postname_like(String n_postname_like) {
this.n_postname_like = n_postname_like;
if(!ObjectUtils.isEmpty(this.n_postname_like)){
this.getSelectCond().like("postname", n_postname_like);
}
}
/**
* 启用快速搜索
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/mapper/IBZDeptMemberMapper.java
浏览文件 @ c0af3241
......@@ -66,4 +66,6 @@ public interface IBZDeptMemberMapper extends BaseMapper<IBZDeptMember>{
List<IBZDeptMember> selectByUserid(@Param("userid") Serializable userid) ;
List<IBZDeptMember> selectByPostid(@Param("postid") Serializable postid) ;
}
ibzou-core/src/main/java/cn/ibizlab/core/ou/mapper/IBZTeamMemberMapper.java
浏览文件 @ c0af3241
......@@ -64,6 +64,8 @@ public interface IBZTeamMemberMapper extends BaseMapper<IBZTeamMember>{
List<IBZTeamMember> selectByUserid(@Param("userid") Serializable userid) ;
List<IBZTeamMember> selectByPostid(@Param("postid") Serializable postid) ;
List<IBZTeamMember> selectByTeamid(@Param("teamid") Serializable teamid) ;
}
ibzou-core/src/main/java/cn/ibizlab/core/ou/service/IIBZDeptMemberService.java
浏览文件 @ c0af3241
......@@ -41,6 +41,8 @@ public interface IIBZDeptMemberService extends IService<IBZDeptMember>{
void removeByDeptid(String deptid) ;
List<IBZDeptMember> selectByUserid(String userid) ;
void removeByUserid(String userid) ;
List<IBZDeptMember> selectByPostid(String postid) ;
void removeByPostid(String postid) ;
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/service/IIBZTeamMemberService.java
浏览文件 @ c0af3241
......@@ -39,6 +39,8 @@ public interface IIBZTeamMemberService extends IService<IBZTeamMember>{
Page<IBZTeamMember> searchDefault(IBZTeamMemberSearchContext context) ;
List<IBZTeamMember> selectByUserid(String userid) ;
void removeByUserid(String userid) ;
List<IBZTeamMember> selectByPostid(String postid) ;
void removeByPostid(String postid) ;
List<IBZTeamMember> selectByTeamid(String teamid) ;
void removeByTeamid(String teamid) ;
/**
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZDeptMemberServiceImpl.java
浏览文件 @ c0af3241
......@@ -50,6 +50,9 @@ public class IBZDeptMemberServiceImpl extends ServiceImpl<IBZDeptMemberMapper, I
@Autowired
@Lazy
private cn.ibizlab.core.ou.service.IIBZEmployeeService ibzemployeeService;
@Autowired
@Lazy
private cn.ibizlab.core.ou.service.IIBZPostService ibzpostService;
private int batchSize = 500;
......@@ -175,6 +178,16 @@ public class IBZDeptMemberServiceImpl extends ServiceImpl<IBZDeptMemberMapper, I
this.remove(new QueryWrapper<IBZDeptMember>().eq("userid",userid));
}
@Override
public List<IBZDeptMember> selectByPostid(String postid) {
return baseMapper.selectByPostid(postid);
}
@Override
public void removeByPostid(String postid) {
this.remove(new QueryWrapper<IBZDeptMember>().eq("postid",postid));
}
/**
* 查询集合 DEFAULT
......@@ -212,6 +225,16 @@ public class IBZDeptMemberServiceImpl extends ServiceImpl<IBZDeptMemberMapper, I
}
et.setPersonname(emp.getPersonname());
}
//实体关系[DER1N_IBZDEPTMEMBER_IBZPOST_POSTID]
if(!ObjectUtils.isEmpty(et.getPostid())){
cn.ibizlab.core.ou.domain.IBZPost post=et.getPost();
if(ObjectUtils.isEmpty(post)){
cn.ibizlab.core.ou.domain.IBZPost majorEntity=ibzpostService.get(et.getPostid());
et.setPost(majorEntity);
post=majorEntity;
}
et.setPostname(post.getPostname());
}
}
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZPostServiceImpl.java
浏览文件 @ c0af3241
......@@ -44,9 +44,15 @@ import org.springframework.util.StringUtils;
@Service("IBZPostServiceImpl")
public class IBZPostServiceImpl extends ServiceImpl<IBZPostMapper, IBZPost> implements IIBZPostService {
@Autowired
@Lazy
private cn.ibizlab.core.ou.service.IIBZDeptMemberService ibzdeptmemberService;
@Autowired
@Lazy
private cn.ibizlab.core.ou.service.IIBZEmployeeService ibzemployeeService;
@Autowired
@Lazy
private cn.ibizlab.core.ou.service.IIBZTeamMemberService ibzteammemberService;
private int batchSize = 500;
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZTeamMemberServiceImpl.java
浏览文件 @ c0af3241
......@@ -49,6 +49,9 @@ public class IBZTeamMemberServiceImpl extends ServiceImpl<IBZTeamMemberMapper, I
private cn.ibizlab.core.ou.service.IIBZEmployeeService ibzemployeeService;
@Autowired
@Lazy
private cn.ibizlab.core.ou.service.IIBZPostService ibzpostService;
@Autowired
@Lazy
private cn.ibizlab.core.ou.service.IIBZTeamService ibzteamService;
private int batchSize = 500;
......@@ -165,6 +168,16 @@ public class IBZTeamMemberServiceImpl extends ServiceImpl<IBZTeamMemberMapper, I
this.remove(new QueryWrapper<IBZTeamMember>().eq("userid",userid));
}
@Override
public List<IBZTeamMember> selectByPostid(String postid) {
return baseMapper.selectByPostid(postid);
}
@Override
public void removeByPostid(String postid) {
this.remove(new QueryWrapper<IBZTeamMember>().eq("postid",postid));
}
@Override
public List<IBZTeamMember> selectByTeamid(String teamid) {
return baseMapper.selectByTeamid(teamid);
......@@ -202,6 +215,16 @@ public class IBZTeamMemberServiceImpl extends ServiceImpl<IBZTeamMemberMapper, I
}
et.setPersonname(emp.getPersonname());
}
//实体关系[DER1N_IBZTEAMMEMBER_IBZPOST_POSTID]
if(!ObjectUtils.isEmpty(et.getPostid())){
cn.ibizlab.core.ou.domain.IBZPost post=et.getPost();
if(ObjectUtils.isEmpty(post)){
cn.ibizlab.core.ou.domain.IBZPost majorEntity=ibzpostService.get(et.getPostid());
et.setPost(majorEntity);
post=majorEntity;
}
et.setPostname(post.getPostname());
}
//实体关系[DER1N_IBZTEAMMEMBER_IBZTEAM_TEAMID]
if(!ObjectUtils.isEmpty(et.getTeamid())){
cn.ibizlab.core.ou.domain.IBZTeam team=et.getTeam();
......
ibzou-core/src/main/resources/mapper/ou/ibzdepartment/IBZDepartmentMapper.xml
浏览文件 @ c0af3241
......@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`BCODE`, t1.`CREATEDATE`, t1.`DEPTCODE`, t1.`DEPTID`, t1.`DEPTLEVEL`, t1.`DEPTNAME`, t1.`ENABLE`, t1.`LEADERID`, t1.`LEADERNAME`, t1.`ORGID`, t11.`ORGNAME`, t1.`PDEPTID`, t21.`DEPTNAME` AS `PDEPTNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZDEPT` t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID ) t1 where deptid=#{id}]]>
</select>
<select id="selectById" resultMap="IBZDepartmentResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.ENABLE, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID ) t1 where deptid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.DOMAINS, t1.ENABLE, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID ) t1 where deptid=#{id}]]>
</select>
<select id="selectById" resultMap="IBZDepartmentResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.ENABLE, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID ) t1 where deptid=#{id}]]>
......@@ -55,37 +55,37 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`BCODE`, t1.`CREATEDATE`, t1.`DEPTCODE`, t1.`DEPTID`, t1.`DEPTLEVEL`, t1.`DEPTNAME`, t1.`ENABLE`, t1.`LEADERID`, t1.`LEADERNAME`, t1.`ORGID`, t11.`ORGNAME`, t1.`PDEPTID`, t21.`DEPTNAME` AS `PDEPTNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZDEPT` t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID
WHERE t1.enable = 1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.ENABLE, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID
WHERE t1.enable = 1
<![CDATA[ SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.DOMAINS, t1.ENABLE, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.ENABLE, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID
WHERE t1.enable = 1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`BCODE`, t1.`CREATEDATE`, t1.`DEPTCODE`, t1.`DEPTID`, t1.`DEPTLEVEL`, t1.`DEPTNAME`, t1.`ENABLE`, t1.`LEADERID`, t1.`LEADERNAME`, t1.`ORGID`, t11.`ORGNAME`, t1.`PDEPTID`, t21.`DEPTNAME` AS `PDEPTNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZDEPT` t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID
WHERE t1.enable = 1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.ENABLE, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID
WHERE t1.enable = 1
<![CDATA[ SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.DOMAINS, t1.ENABLE, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.ENABLE, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID
WHERE t1.enable = 1
WHERE t1.ENABLE = 1
]]>
</sql>
</mapper>
......
ibzou-core/src/main/resources/mapper/ou/ibzdeptmember/IBZDeptMemberMapper.xml
浏览文件 @ c0af3241
......@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`DEPTID`, t11.`DEPTNAME`, t1.`MEMBERID`, t21.`PERSONNAME`, t1.`USERID` FROM `IBZDEPTMEMBER` t1 LEFT JOIN IBZDEPT t11 ON t1.DEPTID = t11.DEPTID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID ) t1 where memberid=#{id}]]>
</select>
<select id="selectById" resultMap="IBZDeptMemberResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.DEPTID, t11.DEPTNAME, t1.MEMBERID, t21.PERSONNAME, t1.USERID FROM IBZDEPTMEMBER t1 LEFT JOIN IBZDEPT t11 ON t1.DEPTID = t11.DEPTID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID ) t1 where memberid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.DEPTID, t11.DEPTNAME, t1.DOMAINS, t1.MEMBERID, t21.PERSONNAME, t1.POSTID, t31.POSTNAME, t1.USERID FROM IBZDEPTMEMBER t1 LEFT JOIN IBZDEPT t11 ON t1.DEPTID = t11.DEPTID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID LEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID ) t1 where memberid=#{id}]]>
</select>
<select id="selectById" resultMap="IBZDeptMemberResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.DEPTID, t11.DEPTNAME, t1.MEMBERID, t21.PERSONNAME, t1.USERID FROM IBZDEPTMEMBER t1 LEFT JOIN IBZDEPT t11 ON t1.DEPTID = t11.DEPTID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID ) t1 where memberid=#{id}]]>
......@@ -19,12 +19,15 @@
<id property="memberid" column="memberid" /><!--主键字段映射-->
<result property="deptid" column="deptid" />
<result property="userid" column="userid" />
<result property="postid" column="postid" />
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="dept" javaType="cn.ibizlab.core.ou.domain.IBZDepartment" column="deptid" select="cn.ibizlab.core.ou.mapper.IBZDepartmentMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="emp" javaType="cn.ibizlab.core.ou.domain.IBZEmployee" column="userid" select="cn.ibizlab.core.ou.mapper.IBZEmployeeMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="post" javaType="cn.ibizlab.core.ou.domain.IBZPost" column="postid" select="cn.ibizlab.core.ou.mapper.IBZPostMapper.selectById" fetchType="lazy"></association>
</resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_IBZDEPTMEMBER_IBZDEPT_DEPTID] -->
......@@ -40,6 +43,13 @@
<include refid="Default" />
) t1
where userid=#{userid}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_IBZDEPTMEMBER_IBZPOST_POSTID] -->
<select id="selectByPostid" resultMap="IBZDeptMemberResultMap">
select t1.* from (
<include refid="Default" />
) t1
where postid=#{postid}
</select>
<!--数据集合[Default]-->
......@@ -58,7 +68,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.DEPTID, t11.DEPTNAME, t1.MEMBERID, t21.PERSONNAME, t1.USERID FROM IBZDEPTMEMBER t1 LEFT JOIN IBZDEPT t11 ON t1.DEPTID = t11.DEPTID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID
<![CDATA[ SELECT t1.DEPTID, t11.DEPTNAME, t1.DOMAINS, t1.MEMBERID, t21.PERSONNAME, t1.POSTID, t31.POSTNAME, t1.USERID FROM IBZDEPTMEMBER t1 LEFT JOIN IBZDEPT t11 ON t1.DEPTID = t11.DEPTID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID LEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID
]]>
</sql>
<!--数据查询[Default]-->
......@@ -73,7 +83,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.DEPTID, t11.DEPTNAME, t1.MEMBERID, t21.PERSONNAME, t1.USERID FROM IBZDEPTMEMBER t1 LEFT JOIN IBZDEPT t11 ON t1.DEPTID = t11.DEPTID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID
<![CDATA[ SELECT t1.DEPTID, t11.DEPTNAME, t1.DOMAINS, t1.MEMBERID, t21.PERSONNAME, t1.POSTID, t31.POSTNAME, t1.USERID FROM IBZDEPTMEMBER t1 LEFT JOIN IBZDEPT t11 ON t1.DEPTID = t11.DEPTID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID LEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID
]]>
</sql>
<!--数据查询[View]-->
......
ibzou-core/src/main/resources/mapper/ou/ibzemployee/IBZEmployeeMapper.xml
浏览文件 @ c0af3241
......@@ -64,37 +64,37 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`ADDR`, t1.`AVATAR`, t1.`BCODE`, t1.`BIRTHDAY`, t1.`CERTCODE`, t1.`CREATEDATE`, t1.`DOMAINS`, t1.`EMAIL`, t1.`ENABLE`, t1.`FONTSIZE`, t1.`IPADDR`, 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.`SHOWORDER`, t1.`THEME`, t1.`UPDATEDATE`, t1.`USERCODE`, t1.`USERICON`, t1.`USERID`, t1.`USERNAME` FROM `IBZEMP` t1
WHERE t1.enable = 1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.ADDR, t1.AVATAR, t1.BCODE, t1.BIRTHDAY, t1.CERTCODE, t1.CREATEDATE, t1.DOMAINS, t1.EMAIL, t1.ENABLE, t1.FONTSIZE, t1.IPADDR, 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.SHOWORDER, t1.THEME, t1.UPDATEDATE, t1.USERCODE, t1.USERICON, t1.USERID, t1.USERNAME FROM IBZEMP t1
WHERE t1.enable = 1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.ADDR, t1.AVATAR, t1.BCODE, t1.BIRTHDAY, t1.CERTCODE, t1.CREATEDATE, t1.DOMAINS, t1.EMAIL, t1.ENABLE, t1.FONTSIZE, t1.IPADDR, 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.SHOWORDER, t1.THEME, t1.UPDATEDATE, t1.USERCODE, t1.USERICON, t1.USERID, t1.USERNAME FROM IBZEMP t1
WHERE t1.enable = 1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`ADDR`, t1.`AVATAR`, t1.`BCODE`, t1.`BIRTHDAY`, t1.`CERTCODE`, t1.`CREATEDATE`, t1.`DOMAINS`, t1.`EMAIL`, t1.`ENABLE`, t1.`FONTSIZE`, t1.`IPADDR`, 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.`SHOWORDER`, t1.`THEME`, t1.`UPDATEDATE`, t1.`USERCODE`, t1.`USERICON`, t1.`USERID`, t1.`USERNAME` FROM `IBZEMP` t1
WHERE t1.enable = 1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.ADDR, t1.AVATAR, t1.BCODE, t1.BIRTHDAY, t1.CERTCODE, t1.CREATEDATE, t1.DOMAINS, t1.EMAIL, t1.ENABLE, t1.FONTSIZE, t1.IPADDR, 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.SHOWORDER, t1.THEME, t1.UPDATEDATE, t1.USERCODE, t1.USERICON, t1.USERID, t1.USERNAME FROM IBZEMP t1
WHERE t1.enable = 1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.ADDR, t1.AVATAR, t1.BCODE, t1.BIRTHDAY, t1.CERTCODE, t1.CREATEDATE, t1.DOMAINS, t1.EMAIL, t1.ENABLE, t1.FONTSIZE, t1.IPADDR, 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.SHOWORDER, t1.THEME, t1.UPDATEDATE, t1.USERCODE, t1.USERICON, t1.USERID, t1.USERNAME FROM IBZEMP t1
WHERE t1.enable = 1
WHERE t1.ENABLE = 1
]]>
</sql>
</mapper>
......
ibzou-core/src/main/resources/mapper/ou/ibzorganization/IBZOrganizationMapper.xml
浏览文件 @ c0af3241
......@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`ENABLE`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGLEVEL`, t1.`ORGNAME`, t1.`PORGID`, t11.`ORGNAME` AS `PORGNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZORG` t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID ) t1 where orgid=#{id}]]>
</select>
<select id="selectById" resultMap="IBZOrganizationResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.CREATEDATE, t1.ENABLE, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID ) t1 where orgid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.CREATEDATE, t1.DOMAINS, t1.ENABLE, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID ) t1 where orgid=#{id}]]>
</select>
<select id="selectById" resultMap="IBZOrganizationResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.CREATEDATE, t1.ENABLE, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID ) t1 where orgid=#{id}]]>
......@@ -45,37 +45,37 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`ENABLE`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGLEVEL`, t1.`ORGNAME`, t1.`PORGID`, t11.`ORGNAME` AS `PORGNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZORG` t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID
WHERE t1.enable = 1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.CREATEDATE, t1.ENABLE, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID
WHERE t1.enable = 1
<![CDATA[ SELECT t1.CREATEDATE, t1.DOMAINS, t1.ENABLE, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.CREATEDATE, t1.ENABLE, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID
WHERE t1.enable = 1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`ENABLE`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGLEVEL`, t1.`ORGNAME`, t1.`PORGID`, t11.`ORGNAME` AS `PORGNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZORG` t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID
WHERE t1.enable = 1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.CREATEDATE, t1.ENABLE, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID
WHERE t1.enable = 1
<![CDATA[ SELECT t1.CREATEDATE, t1.DOMAINS, t1.ENABLE, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.CREATEDATE, t1.ENABLE, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID
WHERE t1.enable = 1
WHERE t1.ENABLE = 1
]]>
</sql>
</mapper>
......
ibzou-core/src/main/resources/mapper/ou/ibzpost/IBZPostMapper.xml
浏览文件 @ c0af3241
......@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`POSTCODE`, t1.`POSTID`, t1.`POSTNAME` FROM `IBZPOST` t1 ) t1 where postid=#{id}]]>
</select>
<select id="selectById" resultMap="IBZPostResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.POSTCODE, t1.POSTID, t1.POSTNAME FROM IBZPOST t1 ) t1 where postid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.DOMAINS, t1.MEMO, t1.POSTCODE, t1.POSTID, t1.POSTNAME FROM IBZPOST t1 ) t1 where postid=#{id}]]>
</select>
<select id="selectById" resultMap="IBZPostResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.POSTCODE, t1.POSTID, t1.POSTNAME FROM IBZPOST t1 ) t1 where postid=#{id}]]>
......@@ -38,7 +38,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.POSTCODE, t1.POSTID, t1.POSTNAME FROM IBZPOST t1
<![CDATA[ SELECT t1.DOMAINS, t1.MEMO, t1.POSTCODE, t1.POSTID, t1.POSTNAME FROM IBZPOST t1
]]>
</sql>
<!--数据查询[Default]-->
......@@ -53,7 +53,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.POSTCODE, t1.POSTID, t1.POSTNAME FROM IBZPOST t1
<![CDATA[ SELECT t1.DOMAINS, t1.MEMO, t1.POSTCODE, t1.POSTID, t1.POSTNAME FROM IBZPOST t1
]]>
</sql>
<!--数据查询[View]-->
......
ibzou-core/src/main/resources/mapper/ou/ibzteam/IBZTeamMapper.xml
浏览文件 @ c0af3241
......@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`TEAMID`, t1.`TEAMNAME` FROM `IBZTEAM` t1 ) t1 where teamid=#{id}]]>
</select>
<select id="selectById" resultMap="IBZTeamResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.TEAMID, t1.TEAMNAME FROM IBZTEAM t1 ) t1 where teamid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.DOMAINS, t1.MEMO, t1.TEAMID, t1.TEAMNAME FROM IBZTEAM t1 ) t1 where teamid=#{id}]]>
</select>
<select id="selectById" resultMap="IBZTeamResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.TEAMID, t1.TEAMNAME FROM IBZTEAM t1 ) t1 where teamid=#{id}]]>
......@@ -38,7 +38,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.TEAMID, t1.TEAMNAME FROM IBZTEAM t1
<![CDATA[ SELECT t1.DOMAINS, t1.MEMO, t1.TEAMID, t1.TEAMNAME FROM IBZTEAM t1
]]>
</sql>
<!--数据查询[Default]-->
......@@ -53,7 +53,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.TEAMID, t1.TEAMNAME FROM IBZTEAM t1
<![CDATA[ SELECT t1.DOMAINS, t1.MEMO, t1.TEAMID, t1.TEAMNAME FROM IBZTEAM t1
]]>
</sql>
<!--数据查询[View]-->
......
ibzou-core/src/main/resources/mapper/ou/ibzteammember/IBZTeamMemberMapper.xml
浏览文件 @ c0af3241
......@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t21.`PERSONNAME`, t1.`TEAMID`, t1.`TEAMMEMBERID`, t11.`TEAMNAME`, t1.`USERID` FROM `IBZTEAMMEMBER` t1 LEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID ) t1 where teammemberid=#{id}]]>
</select>
<select id="selectById" resultMap="IBZTeamMemberResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t21.PERSONNAME, t1.TEAMID, t1.TEAMMEMBERID, t11.TEAMNAME, t1.USERID FROM IBZTEAMMEMBER t1 LEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID ) t1 where teammemberid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.DOMAINS, t21.PERSONNAME, t1.POSTID, t31.POSTNAME, t1.TEAMID, t1.TEAMMEMBERID, t11.TEAMNAME, t1.USERID FROM IBZTEAMMEMBER t1 LEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID LEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID ) t1 where teammemberid=#{id}]]>
</select>
<select id="selectById" resultMap="IBZTeamMemberResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t21.PERSONNAME, t1.TEAMID, t1.TEAMMEMBERID, t11.TEAMNAME, t1.USERID FROM IBZTEAMMEMBER t1 LEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID ) t1 where teammemberid=#{id}]]>
......@@ -19,11 +19,14 @@
<id property="teammemberid" column="teammemberid" /><!--主键字段映射-->
<result property="teamid" column="teamid" />
<result property="userid" column="userid" />
<result property="postid" column="postid" />
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="emp" javaType="cn.ibizlab.core.ou.domain.IBZEmployee" column="userid" select="cn.ibizlab.core.ou.mapper.IBZEmployeeMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="post" javaType="cn.ibizlab.core.ou.domain.IBZPost" column="postid" select="cn.ibizlab.core.ou.mapper.IBZPostMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="team" javaType="cn.ibizlab.core.ou.domain.IBZTeam" column="teamid" select="cn.ibizlab.core.ou.mapper.IBZTeamMapper.selectById" fetchType="lazy"></association>
</resultMap>
......@@ -33,6 +36,13 @@
<include refid="Default" />
) t1
where userid=#{userid}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_IBZTEAMMEMBER_IBZPOST_POSTID] -->
<select id="selectByPostid" resultMap="IBZTeamMemberResultMap">
select t1.* from (
<include refid="Default" />
) t1
where postid=#{postid}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_IBZTEAMMEMBER_IBZTEAM_TEAMID] -->
<select id="selectByTeamid" resultMap="IBZTeamMemberResultMap">
......@@ -58,7 +68,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t21.PERSONNAME, t1.TEAMID, t1.TEAMMEMBERID, t11.TEAMNAME, t1.USERID FROM IBZTEAMMEMBER t1 LEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID
<![CDATA[ SELECT t1.DOMAINS, t21.PERSONNAME, t1.POSTID, t31.POSTNAME, t1.TEAMID, t1.TEAMMEMBERID, t11.TEAMNAME, t1.USERID FROM IBZTEAMMEMBER t1 LEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID LEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID
]]>
</sql>
<!--数据查询[Default]-->
......@@ -73,7 +83,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t21.PERSONNAME, t1.TEAMID, t1.TEAMMEMBERID, t11.TEAMNAME, t1.USERID FROM IBZTEAMMEMBER t1 LEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID
<![CDATA[ SELECT t1.DOMAINS, t21.PERSONNAME, t1.POSTID, t31.POSTNAME, t1.TEAMID, t1.TEAMMEMBERID, t11.TEAMNAME, t1.USERID FROM IBZTEAMMEMBER t1 LEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID LEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID
]]>
</sql>
<!--数据查询[View]-->
......
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/dto/IBZDepartmentDTO.java
浏览文件 @ c0af3241
......@@ -79,6 +79,14 @@ public class IBZDepartmentDTO extends DTOBase implements Serializable {
@JsonProperty("deptlevel")
private Integer deptlevel;
/**
* 属性 [DOMAINS]
*
*/
@JSONField(name = "domains")
@JsonProperty("domains")
private String domains;
/**
* 属性 [SHOWORDER]
*
......@@ -194,6 +202,14 @@ public class IBZDepartmentDTO extends DTOBase implements Serializable {
this.modify("deptlevel",deptlevel);
}
/**
* 设置 [DOMAINS]
*/
public void setDomains(String domains){
this.domains = domains ;
this.modify("domains",domains);
}
/**
* 设置 [SHOWORDER]
*/
......
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/dto/IBZDeptMemberDTO.java
浏览文件 @ c0af3241
......@@ -63,6 +63,30 @@ public class IBZDeptMemberDTO extends DTOBase implements Serializable {
@JsonProperty("personname")
private String personname;
/**
* 属性 [POSTID]
*
*/
@JSONField(name = "postid")
@JsonProperty("postid")
private String postid;
/**
* 属性 [POSTNAME]
*
*/
@JSONField(name = "postname")
@JsonProperty("postname")
private String postname;
/**
* 属性 [DOMAINS]
*
*/
@JSONField(name = "domains")
@JsonProperty("domains")
private String domains;
/**
* 设置 [DEPTID]
......@@ -80,6 +104,22 @@ public class IBZDeptMemberDTO extends DTOBase implements Serializable {
this.modify("userid",userid);
}
/**
* 设置 [POSTID]
*/
public void setPostid(String postid){
this.postid = postid ;
this.modify("postid",postid);
}
/**
* 设置 [DOMAINS]
*/
public void setDomains(String domains){
this.domains = domains ;
this.modify("domains",domains);
}
}
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/dto/IBZOrganizationDTO.java
浏览文件 @ c0af3241
......@@ -87,6 +87,14 @@ public class IBZOrganizationDTO extends DTOBase implements Serializable {
@JsonProperty("parentorgname")
private String parentorgname;
/**
* 属性 [DOMAINS]
*
*/
@JSONField(name = "domains")
@JsonProperty("domains")
private String domains;
/**
* 属性 [ENABLE]
*
......@@ -154,6 +162,14 @@ public class IBZOrganizationDTO extends DTOBase implements Serializable {
this.modify("showorder",showorder);
}
/**
* 设置 [DOMAINS]
*/
public void setDomains(String domains){
this.domains = domains ;
this.modify("domains",domains);
}
}
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/dto/IBZPostDTO.java
浏览文件 @ c0af3241
......@@ -47,6 +47,22 @@ public class IBZPostDTO extends DTOBase implements Serializable {
@JsonProperty("postname")
private String postname;
/**
* 属性 [DOMAINS]
*
*/
@JSONField(name = "domains")
@JsonProperty("domains")
private String domains;
/**
* 属性 [MEMO]
*
*/
@JSONField(name = "memo")
@JsonProperty("memo")
private String memo;
/**
* 设置 [POSTCODE]
......@@ -64,6 +80,22 @@ public class IBZPostDTO extends DTOBase implements Serializable {
this.modify("postname",postname);
}
/**
* 设置 [DOMAINS]
*/
public void setDomains(String domains){
this.domains = domains ;
this.modify("domains",domains);
}
/**
* 设置 [MEMO]
*/
public void setMemo(String memo){
this.memo = memo ;
this.modify("memo",memo);
}
}
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/dto/IBZTeamDTO.java
浏览文件 @ c0af3241
......@@ -39,6 +39,22 @@ public class IBZTeamDTO extends DTOBase implements Serializable {
@JsonProperty("teamname")
private String teamname;
/**
* 属性 [MEMO]
*
*/
@JSONField(name = "memo")
@JsonProperty("memo")
private String memo;
/**
* 属性 [DOMAINS]
*
*/
@JSONField(name = "domains")
@JsonProperty("domains")
private String domains;
/**
* 设置 [TEAMNAME]
......@@ -48,6 +64,22 @@ public class IBZTeamDTO extends DTOBase implements Serializable {
this.modify("teamname",teamname);
}
/**
* 设置 [MEMO]
*/
public void setMemo(String memo){
this.memo = memo ;
this.modify("memo",memo);
}
/**
* 设置 [DOMAINS]
*/
public void setDomains(String domains){
this.domains = domains ;
this.modify("domains",domains);
}
}
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/dto/IBZTeamMemberDTO.java
浏览文件 @ c0af3241
......@@ -63,6 +63,30 @@ public class IBZTeamMemberDTO extends DTOBase implements Serializable {
@JsonProperty("personname")
private String personname;
/**
* 属性 [POSTID]
*
*/
@JSONField(name = "postid")
@JsonProperty("postid")
private String postid;
/**
* 属性 [POSTNAME]
*
*/
@JSONField(name = "postname")
@JsonProperty("postname")
private String postname;
/**
* 属性 [DOMAINS]
*
*/
@JSONField(name = "domains")
@JsonProperty("domains")
private String domains;
/**
* 设置 [TEAMID]
......@@ -80,6 +104,22 @@ public class IBZTeamMemberDTO extends DTOBase implements Serializable {
this.modify("userid",userid);
}
/**
* 设置 [POSTID]
*/
public void setPostid(String postid){
this.postid = postid ;
this.modify("postid",postid);
}
/**
* 设置 [DOMAINS]
*/
public void setDomains(String domains){
this.domains = domains ;
this.modify("domains",domains);
}
}
ibzou-util/src/main/java/cn/ibizlab/util/aspect/DEFieldDefaultValueAspect.java
浏览文件 @ c0af3241
......@@ -253,7 +253,7 @@ public class DEFieldDefaultValueAspect
et.set(fieldname,curUser.getMdeptname());
break;
case LOGICVALID:
if(!StringUtils.isEmpty(logicValue)){
if(StringUtils.isEmpty(logicValue)){
logicValue="1";
}
et.set(fieldname,logicValue);
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或