Merge remote-tracking branch 'origin/0205cmt' into 0205cmt
commit
90bcb91890
|
@ -449,7 +449,8 @@
|
||||||
c.LEVELNAME,
|
c.LEVELNAME,
|
||||||
c.PROMISE_TERM_START,
|
c.PROMISE_TERM_START,
|
||||||
c.PROMISE_TERM_END,
|
c.PROMISE_TERM_END,
|
||||||
c.PROMISE_ID
|
c.PROMISE_ID,
|
||||||
|
c.PROMISEPEOPLE_ID
|
||||||
FROM
|
FROM
|
||||||
SYS_USER u
|
SYS_USER u
|
||||||
LEFT JOIN OA_DEPARTMENT d ON d.DEPARTMENT_ID = u.DEPARTMENT_ID
|
LEFT JOIN OA_DEPARTMENT d ON d.DEPARTMENT_ID = u.DEPARTMENT_ID
|
||||||
|
|
|
@ -458,7 +458,8 @@
|
||||||
c.LEVELNAME,
|
c.LEVELNAME,
|
||||||
c.RESPONSIBILITY_TERM_START,
|
c.RESPONSIBILITY_TERM_START,
|
||||||
c.RESPONSIBILITY_TERM_END,
|
c.RESPONSIBILITY_TERM_END,
|
||||||
c.RESPONSIBILITY_ID
|
c.RESPONSIBILITY_ID,
|
||||||
|
c.RESPONSIBILITYPEOPLE_ID
|
||||||
FROM
|
FROM
|
||||||
SYS_USER u
|
SYS_USER u
|
||||||
LEFT JOIN OA_DEPARTMENT d ON d.DEPARTMENT_ID = u.DEPARTMENT_ID
|
LEFT JOIN OA_DEPARTMENT d ON d.DEPARTMENT_ID = u.DEPARTMENT_ID
|
||||||
|
|
Loading…
Reference in New Issue