zcloud_gbs
/
zcloud_gbs_basic_info_gwj
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zcloud_gbs:main
Branches Tags
zcloud_gbs:dev
zcloud_gbs:dev_human_push
zcloud_gbs:dev_xgfuseridcard
zcloud_gbs:dev_xiangguanfang
zcloud_gbs:main
..
compare: zcloud_gbs:dev_xgfuseridcard
Branches Tags
zcloud_gbs:dev
zcloud_gbs:dev_human_push
zcloud_gbs:dev_xgfuseridcard
zcloud_gbs:dev_xiangguanfang
zcloud_gbs:main

No commits in common. "main" and "dev_xgfuseridcard" have entirely different histories.
main ... dev_xgfuseridcard

2 changed files with 5 additions and 7 deletions
Show Stats Expand all files Collapse all files

6
web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
View File

@ -110,8 +110,7 @@ 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.getDepartmentId(), userDO.getDepartmentId())){
|| !Objects.equals(userE.getName(), userDO.getName())){
// 判断底座是否有该用户信息，如果没有则不调用底座
SingleResponse<UserDetailCO> detail = null;
try {
@ -148,8 +147,7 @@ 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.getDepartmentId(), userDO.getDepartmentId())){
|| !Objects.equals(userE.getRoleId(), userDO.getRoleId())){
// 判断底座是否有该用户信息，如果没有则不调用底座
SingleResponse<UserDetailCO> detail = null;
try {

6
web-infrastructure/src/main/resources/mapper/sync/SyncUserMapper.xml
View File

@ -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>)
or u.id = 2034204588722098176
</if>
</where>
order by u.sort ,
u.create_time desc