diff --git a/src/main/resources/mybatis/datasource/system/UserInfoMapper.xml b/src/main/resources/mybatis/datasource/system/UserInfoMapper.xml
index 9a28338..f5c84de 100644
--- a/src/main/resources/mybatis/datasource/system/UserInfoMapper.xml
+++ b/src/main/resources/mybatis/datasource/system/UserInfoMapper.xml
@@ -31,6 +31,10 @@
f.USER_SIGN_FILE_PATH,
f.IS_RECORDER,
f.IS_CHARGE,
+ f.CERTIFICATETYPE,
+ f.AUTHENTICATION,
+ f.PORTRAIT,
+ f.ID_PHOTO,
f.USER_ID
@@ -53,6 +57,10 @@
USER_SIGN_FILE_PATH,
IS_RECORDER,
IS_CHARGE,
+ CERTIFICATETYPE,
+ AUTHENTICATION,
+ PORTRAIT,
+ ID_PHOTO,
USER_ID
@@ -75,6 +83,10 @@
#{USER_SIGN_FILE_PATH},
#{IS_RECORDER},
#{IS_CHARGE},
+ #{CERTIFICATETYPE},
+ #{AUTHENTICATION},
+ #{PORTRAIT},
+ #{ID_PHOTO},
#{USER_ID}
diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
index 4793a19..842e2ab 100644
--- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml
+++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
@@ -85,14 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ISHEAD,
CARDNO,
PLS_ID,
- ISLEADER,
- USER_ID_CARD,
- CERTIFICATETYPE,
- AUTHENTICATION,
- CULTURAL_LEVEL,
- PORTRAIT,
- ID_PHOTO,
- SIGNATURE_FILE_PATH
+ ISLEADER
@@ -135,14 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{ISHEAD},
#{CARDNO},
#{PLS_ID},
- #{ISLEADER},
- #{USER_ID_CARD},
- #{CERTIFICATETYPE},
- #{AUTHENTICATION},
- #{CULTURAL_LEVEL},
- #{PORTRAIT},
- #{ID_PHOTO},
- #{SIGNATURE_FILE_PATH}
+ #{ISLEADER}
@@ -181,14 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
f.ISHEAD,
f.CARDNO,
f.PLS_ID,
- f.ISLEADER,
- f.USER_ID_CARD,
- f.CERTIFICATETYPE,
- f.AUTHENTICATION,
- f.CULTURAL_LEVEL,
- f.PORTRAIT,
- f.ID_PHOTO,
- f.SIGNATURE_FILE_PATH
+ f.ISLEADER
@@ -337,12 +316,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
,ISLEADER = #{ISLEADER}
-
-
-
-
where
USER_ID = #{USER_ID}
@@ -391,6 +364,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
u.DURATION,
u.WORKSTATUS,
u.WORKPERIOD,
+ u.DEPARTMENT_ID,
+ u.POST_ID,
r.ROLE_ID,
r.ROLE_NAME,
d.NAME as DEPARTMENT_NAME,
@@ -403,6 +378,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
,(select count(1) from BUS_STAGESTUDENTRELATION s where s.USER_ID = u.USER_ID) as TASK_COUNT,
(select count(1) from BUS_STAGESTUDENTRELATION s where s.USER_ID = u.USER_ID and s.STAGEEXAMSTATE=3) as COMPLETE_COUNT
+ ,info.USER_ID_CARD
+ ,info.CERTIFICATETYPE
+ ,info.DEGREE_OF_EDUCATION
+ ,info.PERSONNEL_TYPE
+ ,info.DUTIES
+ ,dic.`NAME` as PERSONNEL_TYPE_NAME
from u
left join SYS_ROLE r on u.ROLE_ID = r.ROLE_ID
left join OA_DEPARTMENT d on d.DEPARTMENT_ID=u.DEPARTMENT_ID
@@ -410,6 +391,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join BUS_SHIFTWORKRULES sw on sw.SHIFTWORKRULES_ID = u.SHIFTDUTYONE
left join BUS_SHIFTWORKRULES swr on swr.SHIFTWORKRULES_ID = u.SHIFTDUTYTWO
left join SYS_USERINFO info on info.USER_ID = u.USER_ID
+ left join SYS_DICTIONARIES dic on dic.DICTIONARIES_ID = info.PERSONNEL_TYPE
where
u.ISDELETE = 0
and u.USERNAME != 'admin'