Skip to content

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

ibiz4j 发布系统代码

上级 8931f67f
隐藏空白字符变更
内嵌 并排
正在显示 包含 185 行增加 和 59 行删除
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysDepartment.java
浏览文件 @ 2ae1ce09
......@@ -27,6 +27,7 @@ import cn.ibizlab.util.annotation.Audit;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.baomidou.mybatisplus.annotation.*;
import cn.ibizlab.util.domain.EntityMP;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
/**
* 实体[部门]
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysDeptMember.java
浏览文件 @ 2ae1ce09
......@@ -27,6 +27,7 @@ import cn.ibizlab.util.annotation.Audit;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.baomidou.mybatisplus.annotation.*;
import cn.ibizlab.util.domain.EntityMP;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
/**
* 实体[部门成员]
......@@ -164,22 +165,6 @@ public class SysDeptMember extends EntityMP implements Serializable {
}
/**
* 获取 [标识]
*/
public String getMemberid(){
if(ObjectUtils.isEmpty(memberid)){
memberid=(String)getDefaultKey(true);
}
return memberid;
}
@Override
public Serializable getDefaultKey(boolean gen) {
if((!ObjectUtils.isEmpty(this.getDeptid()))&&(!ObjectUtils.isEmpty(this.getUserid())))
return DigestUtils.md5DigestAsHex(String.format("%s||%s" ,this.getDeptid(),this.getUserid()).getBytes());
return null;
}
}
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysEmployee.java
浏览文件 @ 2ae1ce09
......@@ -27,6 +27,7 @@ import cn.ibizlab.util.annotation.Audit;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.baomidou.mybatisplus.annotation.*;
import cn.ibizlab.util.domain.EntityMP;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
/**
* 实体[人员]
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysOrganization.java
浏览文件 @ 2ae1ce09
......@@ -27,6 +27,7 @@ import cn.ibizlab.util.annotation.Audit;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.baomidou.mybatisplus.annotation.*;
import cn.ibizlab.util.domain.EntityMP;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
/**
* 实体[单位机构]
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysPost.java
浏览文件 @ 2ae1ce09
......@@ -27,6 +27,7 @@ import cn.ibizlab.util.annotation.Audit;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.baomidou.mybatisplus.annotation.*;
import cn.ibizlab.util.domain.EntityMP;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
/**
* 实体[岗位]
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysTeam.java
浏览文件 @ 2ae1ce09
......@@ -27,6 +27,7 @@ import cn.ibizlab.util.annotation.Audit;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.baomidou.mybatisplus.annotation.*;
import cn.ibizlab.util.domain.EntityMP;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
/**
* 实体[组]
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysTeamMember.java
浏览文件 @ 2ae1ce09
......@@ -27,6 +27,7 @@ import cn.ibizlab.util.annotation.Audit;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.baomidou.mybatisplus.annotation.*;
import cn.ibizlab.util.domain.EntityMP;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
/**
* 实体[组成员]
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysDeptMemberServiceImpl.java
浏览文件 @ 2ae1ce09
......@@ -71,7 +71,7 @@ public class SysDeptMemberServiceImpl extends ServiceImpl<SysDeptMemberMapper, S
@Override
public void createBatch(List<SysDeptMember> list) {
list.forEach(item->fillParentData(item));
this.saveOrUpdateBatch(list,batchSize);
this.saveBatch(list,batchSize);
}
@Override
......
ibzou-core/src/main/resources/mapper/ou/sysdepartment/SysDepartmentMapper.xml
浏览文件 @ 2ae1ce09
......@@ -8,7 +8,7 @@
<![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="SysDepartmentResultMap" databaseId="oracle">
<![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 SYS_DEPT t1 LEFT JOIN SYS_ORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN SYS_DEPT 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="SysDepartmentResultMap" 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 SYS_DEPT t1 LEFT JOIN SYS_ORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN SYS_DEPT t21 ON t1.PDEPTID = t21.DEPTID ) t1 where deptid=#{id}]]>
......@@ -60,7 +60,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![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 SYS_DEPT t1 LEFT JOIN SYS_ORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN SYS_DEPT t21 ON t1.PDEPTID = t21.DEPTID
<![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>
......@@ -78,7 +78,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![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 SYS_DEPT t1 LEFT JOIN SYS_ORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN SYS_DEPT t21 ON t1.PDEPTID = t21.DEPTID
<![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>
......
ibzou-core/src/main/resources/mapper/ou/sysdeptmember/SysDeptMemberMapper.xml
浏览文件 @ 2ae1ce09
......@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t11.`BCODE`, 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="SysDeptMemberResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.DEPTID, t11.DEPTNAME, t1.DOMAINS, t1.MEMBERID, t21.PERSONNAME, t1.POSTID, t31.POSTNAME, t1.USERID FROM SYS_DEPTMEMBER t1 LEFT JOIN SYS_DEPT t11 ON t1.DEPTID = t11.DEPTID LEFT JOIN SYS_EMP t21 ON t1.USERID = t21.USERID LEFT JOIN SYS_POST t31 ON t1.POSTID = t31.POSTID ) t1 where memberid=#{id}]]>
<![CDATA[select t1.* from (SELECT t11.BCODE, 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="SysDeptMemberResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.DEPTID, t11.DEPTNAME, t1.MEMBERID, t21.PERSONNAME, t1.USERID FROM SYS_DEPTMEMBER t1 LEFT JOIN SYS_DEPT t11 ON t1.DEPTID = t11.DEPTID LEFT JOIN SYS_EMP t21 ON t1.USERID = t21.USERID ) t1 where memberid=#{id}]]>
......@@ -68,7 +68,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.DEPTID, t11.DEPTNAME, t1.DOMAINS, t1.MEMBERID, t21.PERSONNAME, t1.POSTID, t31.POSTNAME, t1.USERID FROM SYS_DEPTMEMBER t1 LEFT JOIN SYS_DEPT t11 ON t1.DEPTID = t11.DEPTID LEFT JOIN SYS_EMP t21 ON t1.USERID = t21.USERID LEFT JOIN SYS_POST t31 ON t1.POSTID = t31.POSTID
<![CDATA[ SELECT t11.BCODE, 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]-->
......@@ -83,7 +83,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.DEPTID, t11.DEPTNAME, t1.DOMAINS, t1.MEMBERID, t21.PERSONNAME, t1.POSTID, t31.POSTNAME, t1.USERID FROM SYS_DEPTMEMBER t1 LEFT JOIN SYS_DEPT t11 ON t1.DEPTID = t11.DEPTID LEFT JOIN SYS_EMP t21 ON t1.USERID = t21.USERID LEFT JOIN SYS_POST t31 ON t1.POSTID = t31.POSTID
<![CDATA[ SELECT t11.BCODE, 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/sysemployee/SysEmployeeMapper.xml
浏览文件 @ 2ae1ce09
......@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (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 ) t1 where userid=#{id}]]>
</select>
<select id="selectById" resultMap="SysEmployeeResultMap" databaseId="oracle">
<![CDATA[select t1.* from (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 SYS_EMP t1 ) t1 where userid=#{id}]]>
<![CDATA[select t1.* from (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 ) t1 where userid=#{id}]]>
</select>
<select id="selectById" resultMap="SysEmployeeResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (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 SYS_EMP t1 ) t1 where userid=#{id}]]>
......@@ -69,7 +69,7 @@
</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 SYS_EMP t1
<![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
]]>
</sql>
......@@ -87,7 +87,7 @@
</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 SYS_EMP t1
<![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
]]>
</sql>
......
ibzou-core/src/main/resources/mapper/ou/sysorganization/SysOrganizationMapper.xml
浏览文件 @ 2ae1ce09
......@@ -8,7 +8,7 @@
<![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="SysOrganizationResultMap" databaseId="oracle">
<![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 SYS_ORG t1 LEFT JOIN SYS_ORG 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="SysOrganizationResultMap" 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 SYS_ORG t1 LEFT JOIN SYS_ORG t11 ON t1.PORGID = t11.ORGID ) t1 where orgid=#{id}]]>
......@@ -50,7 +50,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![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 SYS_ORG t1 LEFT JOIN SYS_ORG t11 ON t1.PORGID = t11.ORGID
<![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>
......@@ -68,7 +68,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![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 SYS_ORG t1 LEFT JOIN SYS_ORG t11 ON t1.PORGID = t11.ORGID
<![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>
......
ibzou-core/src/main/resources/mapper/ou/syspost/SysPostMapper.xml
浏览文件 @ 2ae1ce09
......@@ -8,7 +8,7 @@
<![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="SysPostResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.DOMAINS, t1.MEMO, t1.POSTCODE, t1.POSTID, t1.POSTNAME FROM SYS_POST 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="SysPostResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.POSTCODE, t1.POSTID, t1.POSTNAME FROM SYS_POST t1 ) t1 where postid=#{id}]]>
......@@ -38,7 +38,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.DOMAINS, t1.MEMO, t1.POSTCODE, t1.POSTID, t1.POSTNAME FROM SYS_POST 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.DOMAINS, t1.MEMO, t1.POSTCODE, t1.POSTID, t1.POSTNAME FROM SYS_POST 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/systeam/SysTeamMapper.xml
浏览文件 @ 2ae1ce09
......@@ -8,7 +8,7 @@
<![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="SysTeamResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.DOMAINS, t1.MEMO, t1.TEAMID, t1.TEAMNAME FROM SYS_TEAM 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="SysTeamResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.TEAMID, t1.TEAMNAME FROM SYS_TEAM t1 ) t1 where teamid=#{id}]]>
......@@ -38,7 +38,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.DOMAINS, t1.MEMO, t1.TEAMID, t1.TEAMNAME FROM SYS_TEAM 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.DOMAINS, t1.MEMO, t1.TEAMID, t1.TEAMNAME FROM SYS_TEAM t1
<![CDATA[ SELECT t1.DOMAINS, t1.MEMO, t1.TEAMID, t1.TEAMNAME FROM IBZTEAM t1
]]>
</sql>
<!--数据查询[View]-->
......
ibzou-core/src/main/resources/mapper/ou/systeammember/SysTeamMemberMapper.xml
浏览文件 @ 2ae1ce09
......@@ -8,7 +8,7 @@
<![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="SysTeamMemberResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.DOMAINS, t21.PERSONNAME, t1.POSTID, t31.POSTNAME, t1.TEAMID, t1.TEAMMEMBERID, t11.TEAMNAME, t1.USERID FROM SYS_TEAMMEMBER t1 LEFT JOIN SYS_TEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN SYS_EMP t21 ON t1.USERID = t21.USERID LEFT JOIN SYS_POST t31 ON t1.POSTID = t31.POSTID ) 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="SysTeamMemberResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t21.PERSONNAME, t1.TEAMID, t1.TEAMMEMBERID, t11.TEAMNAME, t1.USERID FROM SYS_TEAMMEMBER t1 LEFT JOIN SYS_TEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN SYS_EMP t21 ON t1.USERID = t21.USERID ) t1 where teammemberid=#{id}]]>
......@@ -68,7 +68,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.DOMAINS, t21.PERSONNAME, t1.POSTID, t31.POSTNAME, t1.TEAMID, t1.TEAMMEMBERID, t11.TEAMNAME, t1.USERID FROM SYS_TEAMMEMBER t1 LEFT JOIN SYS_TEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN SYS_EMP t21 ON t1.USERID = t21.USERID LEFT JOIN SYS_POST t31 ON t1.POSTID = t31.POSTID
<![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]-->
......@@ -83,7 +83,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.DOMAINS, t21.PERSONNAME, t1.POSTID, t31.POSTNAME, t1.TEAMID, t1.TEAMMEMBERID, t11.TEAMNAME, t1.USERID FROM SYS_TEAMMEMBER t1 LEFT JOIN SYS_TEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN SYS_EMP t21 ON t1.USERID = t21.USERID LEFT JOIN SYS_POST t31 ON t1.POSTID = t31.POSTID
<![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-core/src/main/resources/rules/SysEmployeesaveDeptMemberRule.drl
浏览文件 @ 2ae1ce09
package cn.ibizlab.ou.logic.sysemployeelogic.savedeptmember;
import java.util.Map;
import java.util.HashMap;
import com.alibaba.fastjson.JSONObject;
import org.springframework.util.StringUtils;
global cn.ibizlab.core.ou.domain.SysEmployee sysemployeesavedeptmemberdefault;
global cn.ibizlab.core.ou.domain.SysDeptMember sysemployeesavedeptmembermember;
global cn.ibizlab.core.ou.service.ISysDeptMemberService sysdeptmemberservice;
global cn.ibizlab.core.ou.service.ISysEmployeeService iBzSysSysemployeeDefaultService;
global cn.ibizlab.util.security.AuthenticationUser curuser;
no-loop
//逻辑处理节点[开始]
......
ibzou-core/src/main/resources/rules/SysEmployeesaveDeptMemberRuleFlow.bpmn
浏览文件 @ 2ae1ce09
......@@ -8,14 +8,14 @@
<tns:global identifier="sysemployeesavedeptmemberdefault" type="cn.ibizlab.core.ou.domain.SysEmployee" />
<tns:global identifier="sysemployeesavedeptmembermember" type="cn.ibizlab.core.ou.domain.SysDeptMember" />
</extensionElements>
<startEvent id="ce0d0ff1776568ee1d4aa9b085a05300" isInterrupting="true"/>
<businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="sysemployeesavedeptmemberdeaction1" id="40d4f46408c08c5c1182a2471c1deddf" implementation="http://www.jboss.org/drools/rule" name="保存成员"/>
<endEvent id="40d4f46408c08c5c1182a2471c1deddf_End" name="End"/>
<sequenceFlow id="40d4f46408c08c5c1182a2471c1deddf_End_Line" sourceRef="40d4f46408c08c5c1182a2471c1deddf" targetRef="40d4f46408c08c5c1182a2471c1deddf_End"/>
<businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="sysemployeesavedeptmemberprepareparam1" id="c97400ea14003bae9f2ae38840a1e7bc" implementation="http://www.jboss.org/drools/rule" name="准备成员"/>
<sequenceFlow id="cee3ceec6fe80812d8ec99e25778a347" sourceRef="c97400ea14003bae9f2ae38840a1e7bc" targetRef="40d4f46408c08c5c1182a2471c1deddf">
<startEvent id="begin" isInterrupting="true"/>
<businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="sysemployeesavedeptmemberdeaction1" id="deaction1" implementation="http://www.jboss.org/drools/rule" name="保存成员"/>
<endEvent id="deaction1_end" name="end"/>
<sequenceFlow id="deaction1_end_line" sourceRef="deaction1" targetRef="deaction1_end"/>
<businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="sysemployeesavedeptmemberprepareparam1" id="prepareparam1" implementation="http://www.jboss.org/drools/rule" name="准备成员"/>
<sequenceFlow id="prepareparam1_deaction1" sourceRef="prepareparam1" targetRef="deaction1">
</sequenceFlow>
<sequenceFlow id="25a3b987e2538039354c424b25412af1" sourceRef="ce0d0ff1776568ee1d4aa9b085a05300" targetRef="c97400ea14003bae9f2ae38840a1e7bc">
<sequenceFlow id="begin_prepareparam1" sourceRef="begin" targetRef="prepareparam1">
</sequenceFlow>
</process>
</definitions>
......
ibzou-dependencies/pom.xml
浏览文件 @ 2ae1ce09
......@@ -87,6 +87,7 @@
<alibaba-seata.version>1.3.0</alibaba-seata.version>
<oracle.version>11.2.0.3</oracle.version>
<postgresql.version>42.2.6</postgresql.version>
</properties>
......@@ -337,6 +338,12 @@
<artifactId>ojdbc6</artifactId>
<version>${oracle.version}</version>
</dependency>
<!-- PostgreSQL驱动包 -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
</dependency>
<!-- MySQL驱动包 -->
<dependency>
<groupId>mysql</groupId>
......
ibzou-util/src/main/java/cn/ibizlab/util/client/IBZWFFallback.java
浏览文件 @ 2ae1ce09
package cn.ibizlab.util.client;
import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSONObject;
import java.util.*;
@Component
......@@ -20,4 +21,9 @@ public class IBZWFFallback implements IBZWFFeignClient {
public Boolean deployBpmnFile(List<Map<String, Object>> bpmnfiles) {
return null;
}
@Override
public JSONObject wfstart(String system, String appname, String entity, String businessKey, JSONObject instance) {
return null;
}
}
ibzou-util/src/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java
浏览文件 @ 2ae1ce09
......@@ -2,6 +2,7 @@ package cn.ibizlab.util.client;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONObject;
import java.util.*;
@FeignClient(value = "${ibiz.ref.service.wf:ibzwf-api}",fallback = IBZWFFallback.class)
......@@ -18,4 +19,9 @@ public interface IBZWFFeignClient
@RequestMapping(method = RequestMethod.POST, value = "/deploybpmn")
Boolean deployBpmnFile(@RequestBody List<Map<String,Object>> bpmnfiles);
@RequestMapping(method = RequestMethod.POST, value = "/{system}-app-{appname}/{entity}/{businessKey}/process-instances")
JSONObject wfstart(@PathVariable("system") String system, @PathVariable("appname") String appname,
@PathVariable("entity") String entity,
@PathVariable("businessKey") String businessKey, @RequestBody JSONObject instance);
}
ibzou-util/src/main/java/cn/ibizlab/util/security/AuthenticationUser.java
浏览文件 @ 2ae1ce09
......@@ -18,59 +18,174 @@ import com.alibaba.fastjson.JSONObject;
@JsonIgnoreProperties(ignoreUnknown = true)
public class AuthenticationUser implements UserDetails
{
public AuthenticationUser()
{
}
public AuthenticationUser(){}
/**
* 用戶标识
*/
private String userid;
/**
* 用户全局名
*/
private String username;
/**
* 用户姓名
*/
private String personname;
private String usercode;
/**
* 登录名
*/
private String loginname;
/**
* 用户工号
*/
private String usercode;
/**
* 登录密码
*/
private String password;
/**
* 区属
*/
private String domain;
/**
* 部门标识
*/
private String mdeptid;
/**
* 部门编码
*/
private String mdeptcode;
/**
* 部门名称
*/
private String mdeptname;
/**
* 业务编码
*/
private String bcode;
/**
* 岗位标识
*/
private String postid;
/**
* 岗位代码
*/
private String postcode;
/**
* 岗位名称
*/
private String postname;
/**
* 单位标识
*/
private String orgid;
/**
* 单位编码
*/
private String orgcode;
/**
* 单位名称
*/
private String orgname;
/**
* 昵称别名
*/
private String nickname;
/**
* 邮箱
*/
private String email;
/**
* 社交账号
*/
private String avatar;
/**
* 电话
*/
private String phone;
private String reserver;
/**
* 照片
*/
private String usericon;
/**
* 性别
*/
private String sex;
/**
* 出生日期
*/
private Timestamp birthday;
/**
* 证件号码
*/
private String certcode;
/**
* 地址
*/
private String addr;
/**
* 主题
*/
private String theme;
/**
* 字号
*/
private String fontsize;
/**
* 语言
*/
private String lang;
/**
* 备注
*/
private String memo;
/**
* 保留字段
*/
private String reserver;
/**
* 用户上下文参数
*/
private Map <String,Object> sessionParams;
/**
* 用户权限资源
*/
@JsonIgnore
private Collection<GrantedAuthority> authorities;
/**
* 是否为超级管理员
*/
private int superuser;
/**
* 用户权限资源
*/
private JSONObject permissionList;
private String orglevel;//单位级别
private String deptlevel;//部门级别
/**
* 用户上下文参数
*/
@JsonIgnore
private Map<String,Object> userSessionParam;//用户自定义session值
private Map<String, Set<String>> orgInfo;//上下级组织信息
private Map<String,Object> userSessionParam;
/**
* 当前用户上下级组织信息
*/
private Map<String, Set<String>> orgInfo;
/**
* 上级组织
*/
private String porg;
/**
* 下级组织
*/
private String sorg;
/**
* 上级部门
*/
private String pdept;
/**
* 下级部门
*/
private String sdept;
@JsonIgnore
@Override
public boolean isAccountNonExpired() {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或