Skip to content

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

ibiz4j 发布系统代码

上级 7d7ee0a4
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 388 行增加 和 282 行删除
app_web/package.json
浏览文件 @ 8278a24b
......@@ -26,7 +26,7 @@
"element-ui": "^2.13.0",
"file-saver": "^2.0.2",
"font-awesome": "^4.7.0",
"ibiz-gantt-elastic": "^1.0.16",
"ibiz-gantt-elastic": "^1.0.17",
"ibiz-vue-lib": "^0.1.10",
"interactjs": "^1.9.4",
"moment": "^2.24.0",
......
app_web/src/components/app-form-group/app-form-group.vue
浏览文件 @ 8278a24b
......@@ -28,21 +28,25 @@
<dropdown-menu slot='list' v-if="uiActionGroup.details && Array.isArray(uiActionGroup.details)">
<dropdown-item v-for="(detail,index) in (uiActionGroup.details)" :key="index" :name="detail.name">
<span class='item' @click="doUIAction($event, detail)">
<template v-if="detail.icon && !Object.is(detail.icon, '')">
<i :class="detail.icon" ></i>
</template>
<template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
<div v-if="detail.img && !Object.is(detail.img, '')">
<img :src="detail.img" />
</div>
<template v-if="detail.isShowIcon">
<template v-if="detail.icon && !Object.is(detail.icon, '')">
<i :class="detail.icon" ></i>
</template>
<template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
<div v-if="detail.img && !Object.is(detail.img, '')">
<img :src="detail.img" />
</div>
</template>
</template>
&nbsp;
<span>
<template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
{{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
</template>
<template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
{{detail.caption}}
<template v-if="detail.isShowCaption">
<template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
{{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
</template>
<template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
{{detail.caption}}
</template>
</template>
</span>
</span>
......@@ -55,21 +59,25 @@
<template v-if="uiActionGroup.details && Array.isArray(uiActionGroup.details)">
<div v-for="(detail,index) in uiActionGroup.details" :key="index">
<span class='item' @click="doUIAction($event, detail)">
<template v-if="detail.icon && !Object.is(detail.icon, '')">
<i :class="detail.icon" ></i>
</template>
<template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
<div v-if="detail.img && !Object.is(detail.img, '')">
<img :src="detail.img" />
</div>
</template>
<template v-if="detail.isShowIcon">
<template v-if="detail.icon && !Object.is(detail.icon, '')">
<i :class="detail.icon" ></i>
</template>
<template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
<div v-if="detail.img && !Object.is(detail.img, '')">
<img :src="detail.img" />
</div>
</template>
</template>
&nbsp;
<span>
<template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
{{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
</template>
<template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
{{detail.caption}}
<template v-if="detail.isShowCaption">
<template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
{{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
</template>
<template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
{{detail.caption}}
</template>
</template>
</span>
</span>
......
app_web/src/components/app-transfer/app-transfer.less
浏览文件 @ 8278a24b
.ivu-select-dropdown {
padding: 0px;
.hidden {
display: none;
}
}
\ No newline at end of file
.transfer-select{
.ivu-select-dropdown {
padding: 0px;
.hidden {
display: none;
}
.el-transfer{
min-width: 100% !important;
display: flex;
justify-content: space-between;
.el-transfer-panel{
min-width: 25%;
}
.el-transfer__buttons{
align-self: center;
}
}
}
}
ibzou-core/src/main/java/cn/ibizlab/core/extensions.service/IBZEmployeeServiceEx.java
浏览文件 @ 8278a24b
......@@ -28,7 +28,7 @@ public class IBZEmployeeServiceEx extends IBZEmployeeServiceImpl {
@Override
@Transactional
public IBZEmployee initPwd(IBZEmployee et) {
return et;
return super.initPwd(et);
}
}
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZDepartment.java
浏览文件 @ 8278a24b
......@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger;
import java.util.HashMap;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
......@@ -192,6 +193,7 @@ public class IBZDepartment extends EntityMP implements Serializable {
this.deptcode = deptcode ;
this.modify("deptcode",deptcode);
}
/**
* 设置 [部门名称]
*/
......@@ -199,6 +201,7 @@ public class IBZDepartment extends EntityMP implements Serializable {
this.deptname = deptname ;
this.modify("deptname",deptname);
}
/**
* 设置 [上级部门]
*/
......@@ -206,6 +209,7 @@ public class IBZDepartment extends EntityMP implements Serializable {
this.parentdeptid = parentdeptid ;
this.modify("pdeptid",parentdeptid);
}
/**
* 设置 [部门简称]
*/
......@@ -213,6 +217,7 @@ public class IBZDepartment extends EntityMP implements Serializable {
this.shortname = shortname ;
this.modify("shortname",shortname);
}
/**
* 设置 [部门级别]
*/
......@@ -220,6 +225,7 @@ public class IBZDepartment extends EntityMP implements Serializable {
this.deptlevel = deptlevel ;
this.modify("deptlevel",deptlevel);
}
/**
* 设置 [区属]
*/
......@@ -227,6 +233,7 @@ public class IBZDepartment extends EntityMP implements Serializable {
this.domains = domains ;
this.modify("domains",domains);
}
/**
* 设置 [排序]
*/
......@@ -234,6 +241,7 @@ public class IBZDepartment extends EntityMP implements Serializable {
this.showorder = showorder ;
this.modify("showorder",showorder);
}
/**
* 设置 [业务编码]
*/
......@@ -241,6 +249,7 @@ public class IBZDepartment extends EntityMP implements Serializable {
this.bcode = bcode ;
this.modify("bcode",bcode);
}
/**
* 设置 [分管领导标识]
*/
......@@ -248,6 +257,7 @@ public class IBZDepartment extends EntityMP implements Serializable {
this.leaderid = leaderid ;
this.modify("leaderid",leaderid);
}
/**
* 设置 [分管领导]
*/
......@@ -256,6 +266,7 @@ public class IBZDepartment extends EntityMP implements Serializable {
this.modify("leadername",leadername);
}
}
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZDeptMember.java
浏览文件 @ 8278a24b
......@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger;
import java.util.HashMap;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
......@@ -129,6 +130,7 @@ public class IBZDeptMember extends EntityMP implements Serializable {
this.deptid = deptid ;
this.modify("deptid",deptid);
}
/**
* 设置 [用户标识]
*/
......@@ -136,6 +138,7 @@ public class IBZDeptMember extends EntityMP implements Serializable {
this.userid = userid ;
this.modify("userid",userid);
}
/**
* 设置 [岗位标识]
*/
......@@ -143,6 +146,7 @@ public class IBZDeptMember extends EntityMP implements Serializable {
this.postid = postid ;
this.modify("postid",postid);
}
/**
* 设置 [区属]
*/
......@@ -151,6 +155,7 @@ public class IBZDeptMember extends EntityMP implements Serializable {
this.modify("domains",domains);
}
/**
* 获取 [标识]
*/
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZEmployee.java
浏览文件 @ 8278a24b
......@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger;
import java.util.HashMap;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
......@@ -334,6 +335,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.username = username ;
this.modify("username",username);
}
/**
* 设置 [姓名]
*/
......@@ -341,6 +343,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.personname = personname ;
this.modify("personname",personname);
}
/**
* 设置 [用户工号]
*/
......@@ -348,6 +351,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.usercode = usercode ;
this.modify("usercode",usercode);
}
/**
* 设置 [登录名]
*/
......@@ -355,6 +359,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.loginname = loginname ;
this.modify("loginname",loginname);
}
/**
* 设置 [密码]
*/
......@@ -362,6 +367,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.password = password ;
this.modify("password",password);
}
/**
* 设置 [区属]
*/
......@@ -369,6 +375,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.domains = domains ;
this.modify("domains",domains);
}
/**
* 设置 [主部门]
*/
......@@ -376,6 +383,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.mdeptid = mdeptid ;
this.modify("mdeptid",mdeptid);
}
/**
* 设置 [主部门代码]
*/
......@@ -383,6 +391,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.mdeptcode = mdeptcode ;
this.modify("mdeptcode",mdeptcode);
}
/**
* 设置 [主部门名称]
*/
......@@ -390,6 +399,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.mdeptname = mdeptname ;
this.modify("mdeptname",mdeptname);
}
/**
* 设置 [业务编码]
*/
......@@ -397,6 +407,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.bcode = bcode ;
this.modify("bcode",bcode);
}
/**
* 设置 [岗位标识]
*/
......@@ -404,6 +415,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.postid = postid ;
this.modify("postid",postid);
}
/**
* 设置 [岗位代码]
*/
......@@ -411,6 +423,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.postcode = postcode ;
this.modify("postcode",postcode);
}
/**
* 设置 [岗位名称]
*/
......@@ -418,6 +431,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.postname = postname ;
this.modify("postname",postname);
}
/**
* 设置 [单位代码]
*/
......@@ -425,6 +439,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.orgcode = orgcode ;
this.modify("orgcode",orgcode);
}
/**
* 设置 [昵称别名]
*/
......@@ -432,6 +447,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.nickname = nickname ;
this.modify("nickname",nickname);
}
/**
* 设置 [性别]
*/
......@@ -439,6 +455,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.sex = sex ;
this.modify("sex",sex);
}
/**
* 设置 [证件号码]
*/
......@@ -446,6 +463,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.certcode = certcode ;
this.modify("certcode",certcode);
}
/**
* 设置 [联系方式]
*/
......@@ -453,6 +471,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.phone = phone ;
this.modify("phone",phone);
}
/**
* 设置 [出生日期]
*/
......@@ -460,6 +479,17 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.birthday = birthday ;
this.modify("birthday",birthday);
}
/**
* 格式化日期 [出生日期]
*/
public String formatBirthday(){
if (this.birthday == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("defieldFormatStr");
return sdf.format(birthday);
}
/**
* 设置 [邮件]
*/
......@@ -467,6 +497,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.email = email ;
this.modify("email",email);
}
/**
* 设置 [社交账号]
*/
......@@ -474,6 +505,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.avatar = avatar ;
this.modify("avatar",avatar);
}
/**
* 设置 [地址]
*/
......@@ -481,6 +513,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.addr = addr ;
this.modify("addr",addr);
}
/**
* 设置 [照片]
*/
......@@ -488,6 +521,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.usericon = usericon ;
this.modify("usericon",usericon);
}
/**
* 设置 [ip地址]
*/
......@@ -495,6 +529,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.ipaddr = ipaddr ;
this.modify("ipaddr",ipaddr);
}
/**
* 设置 [样式]
*/
......@@ -502,6 +537,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.theme = theme ;
this.modify("theme",theme);
}
/**
* 设置 [语言]
*/
......@@ -509,6 +545,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.lang = lang ;
this.modify("lang",lang);
}
/**
* 设置 [字号]
*/
......@@ -516,6 +553,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.fontsize = fontsize ;
this.modify("fontsize",fontsize);
}
/**
* 设置 [备注]
*/
......@@ -523,6 +561,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.memo = memo ;
this.modify("memo",memo);
}
/**
* 设置 [保留]
*/
......@@ -530,6 +569,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.reserver = reserver ;
this.modify("reserver",reserver);
}
/**
* 设置 [排序]
*/
......@@ -538,6 +578,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.modify("showorder",showorder);
}
}
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZOrganization.java
浏览文件 @ 8278a24b
......@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger;
import java.util.HashMap;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
......@@ -157,6 +158,7 @@ public class IBZOrganization extends EntityMP implements Serializable {
this.orgcode = orgcode ;
this.modify("orgcode",orgcode);
}
/**
* 设置 [上级单位]
*/
......@@ -164,6 +166,7 @@ public class IBZOrganization extends EntityMP implements Serializable {
this.parentorgid = parentorgid ;
this.modify("porgid",parentorgid);
}
/**
* 设置 [单位简称]
*/
......@@ -171,6 +174,7 @@ public class IBZOrganization extends EntityMP implements Serializable {
this.shortname = shortname ;
this.modify("shortname",shortname);
}
/**
* 设置 [单位级别]
*/
......@@ -178,6 +182,7 @@ public class IBZOrganization extends EntityMP implements Serializable {
this.orglevel = orglevel ;
this.modify("orglevel",orglevel);
}
/**
* 设置 [排序]
*/
......@@ -185,6 +190,7 @@ public class IBZOrganization extends EntityMP implements Serializable {
this.showorder = showorder ;
this.modify("showorder",showorder);
}
/**
* 设置 [区属]
*/
......@@ -193,6 +199,7 @@ public class IBZOrganization extends EntityMP implements Serializable {
this.modify("domains",domains);
}
}
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZPost.java
浏览文件 @ 8278a24b
......@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger;
import java.util.HashMap;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
......@@ -84,6 +85,7 @@ public class IBZPost extends EntityMP implements Serializable {
this.postcode = postcode ;
this.modify("postcode",postcode);
}
/**
* 设置 [岗位名称]
*/
......@@ -91,6 +93,7 @@ public class IBZPost extends EntityMP implements Serializable {
this.postname = postname ;
this.modify("postname",postname);
}
/**
* 设置 [区属]
*/
......@@ -98,6 +101,7 @@ public class IBZPost extends EntityMP implements Serializable {
this.domains = domains ;
this.modify("domains",domains);
}
/**
* 设置 [备注]
*/
......@@ -106,6 +110,7 @@ public class IBZPost extends EntityMP implements Serializable {
this.modify("memo",memo);
}
}
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZTeam.java
浏览文件 @ 8278a24b
......@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger;
import java.util.HashMap;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
......@@ -77,6 +78,7 @@ public class IBZTeam extends EntityMP implements Serializable {
this.teamname = teamname ;
this.modify("teamname",teamname);
}
/**
* 设置 [备注]
*/
......@@ -84,6 +86,7 @@ public class IBZTeam extends EntityMP implements Serializable {
this.memo = memo ;
this.modify("memo",memo);
}
/**
* 设置 [区属]
*/
......@@ -92,6 +95,7 @@ public class IBZTeam extends EntityMP implements Serializable {
this.modify("domains",domains);
}
}
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZTeamMember.java
浏览文件 @ 8278a24b
......@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger;
import java.util.HashMap;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
......@@ -129,6 +130,7 @@ public class IBZTeamMember extends EntityMP implements Serializable {
this.teamid = teamid ;
this.modify("teamid",teamid);
}
/**
* 设置 [用户标识]
*/
......@@ -136,6 +138,7 @@ public class IBZTeamMember extends EntityMP implements Serializable {
this.userid = userid ;
this.modify("userid",userid);
}
/**
* 设置 [岗位标识]
*/
......@@ -143,6 +146,7 @@ public class IBZTeamMember extends EntityMP implements Serializable {
this.postid = postid ;
this.modify("postid",postid);
}
/**
* 设置 [区属]
*/
......@@ -151,6 +155,7 @@ public class IBZTeamMember extends EntityMP implements Serializable {
this.modify("domains",domains);
}
/**
* 获取 [组成员标识]
*/
......
ibzou-util/src/main/java/cn/ibizlab/util/security/SimpleTokenUtil.java
浏览文件 @ 8278a24b
......@@ -19,7 +19,7 @@ import java.util.Optional;
import java.util.function.Function;
@Component
@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:UAATokenUtil}'.equals('SimpleTokenUtil')")
@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.token.util:UAATokenUtil}'.equals('SimpleTokenUtil')")
public class SimpleTokenUtil implements AuthTokenUtil,Serializable {
private static final long serialVersionUID = -3301605591108950415L;
......
ibzou-util/src/main/java/cn/ibizlab/util/security/UAATokenUtil.java
浏览文件 @ 8278a24b
......@@ -30,7 +30,7 @@ import java.util.Map;
import java.util.function.Function;
@Component
@ConditionalOnExpression("${ibiz.enablePermissionValid:false}||'${ibiz.auth.service:UAATokenUtil}'.equals('UAATokenUtil')")
@ConditionalOnExpression("${ibiz.enablePermissionValid:false}||'${ibiz.auth.token.util:UAATokenUtil}'.equals('UAATokenUtil')")
public class UAATokenUtil implements AuthTokenUtil, Serializable {
private static final long serialVersionUID = -3301605591108950415L;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或