yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:40450a24e7703d432d5d0b6f484b023d4342bdbd
Branches Tags
yangjun:master
...
compare: yangjun:ccd4831453208be3807662e24a8a3463dfc404e5
Branches Tags
yangjun:master

2 Commits
40450a24e7 ... ccd4831453

Author SHA1 Message Date
bai ccd4831453 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_java 
# Conflicts:
#	src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
 2024-08-13 16:00:46 +08:00
bai 14b5fd4a5a 2024年8月13日 修复问题 2024-08-13 15:59:20 +08:00
1 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

4
src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
View File

@ -285,8 +285,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
}
}
} else {
UserEntity userInfo = new UserEntity();
userInfo.setBindingConsortiaId(userInfo1.getBindingConsortiaId());
UserEntity userInfo;
if(userInfo1.getType()!=null && userInfo1.getType()==2){
userInfo1.setArtificerOpenId(userInfo1.getOpenId());
userInfo1.setOpenId(null);
@ -305,6 +304,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
}
}
userInfo.setUpdateTime(date);
userInfo.setBindingConsortiaId(userInfo1.getBindingConsortiaId());
baseMapper.updateById(userInfo);
if(userInfo1.getType()!=null && userInfo1.getType()==2){
Artificer artificer = artificerService.selectArtificerByUserId(userInfo.getUserId());