Compare commits
2 Commits
| Author | SHA1 | Date |
|---|---|---|
|
|
5662a0a430 | |
|
|
3c37c50374 |
|
|
@ -110,7 +110,8 @@ public class UserUpdateExe {
|
|||
boolean res = userGateway.update(userE);
|
||||
if(!Objects.equals(userE.getPhone(), userDO.getPhone())
|
||||
|| !Objects.equals(userE.getEmail(), userDO.getEmail())
|
||||
|| !Objects.equals(userE.getName(), userDO.getName())){
|
||||
|| !Objects.equals(userE.getName(), userDO.getName())
|
||||
|| !Objects.equals(userE.getDepartmentId(), userDO.getDepartmentId())){
|
||||
// 判断底座是否有该用户信息,如果没有则不调用底座
|
||||
SingleResponse<UserDetailCO> detail = null;
|
||||
try {
|
||||
|
|
@ -147,7 +148,8 @@ public class UserUpdateExe {
|
|||
if(!Objects.equals(userE.getPhone(), userDO.getPhone())
|
||||
|| !Objects.equals(userE.getEmail(), userDO.getEmail())
|
||||
|| !Objects.equals(userE.getName(), userDO.getName())
|
||||
|| !Objects.equals(userE.getRoleId(), userDO.getRoleId())){
|
||||
|| !Objects.equals(userE.getRoleId(), userDO.getRoleId())
|
||||
|| !Objects.equals(userE.getDepartmentId(), userDO.getDepartmentId())){
|
||||
// 判断底座是否有该用户信息,如果没有则不调用底座
|
||||
SingleResponse<UserDetailCO> detail = null;
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
left join department d on d.id = u.department_id
|
||||
left join post p on p.id = u.post_id
|
||||
<where>
|
||||
and u.id != u.corpinfo_id
|
||||
(and u.id != u.corpinfo_id
|
||||
and u.delete_enum = 'FALSE'
|
||||
and u.employment_flag in (1, 2)
|
||||
and u.corpinfo_id = #{params.corpinfoId}
|
||||
|
|
@ -56,8 +56,8 @@
|
|||
</if>
|
||||
<if test="params.userIdCard != null and params.userIdCard != ''">
|
||||
and u.user_id_card = TO_BASE64(#{params.userIdCard})
|
||||
</if>
|
||||
|
||||
</if>)
|
||||
or u.id = 2034204588722098176
|
||||
</where>
|
||||
order by u.sort ,
|
||||
u.create_time desc
|
||||
|
|
|
|||
Loading…
Reference in New Issue