1

src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java

@@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -222,9 +223,6 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         jyUser.setPhone(param.getPhone());
         jyUser.setIdCard(param.getIdCard());
         jyUser.setIsJm(param.getIsJm());
-        if(param.getIsJm() != null){
-            jyUser.setPlatformId(null);
-        }
         if(param.getIsJm() != null && param.getIsJm() == 1){
             sysUser = sysUserService.getById(sysUser.getId());
             if(sysUser.getRoleId() != 47L){
@@ -248,12 +246,16 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
                 platformUserWaitService.del(platformUserWait.getId());
             }
         }
-        if(StringUtils.isNotBlank(param.getIdCard()) && param.getIsJm()!=null && param.getIsJm() == 0){
-            JyPlatform jyPlatform = jyPlatformService.getByIdCard(jyUser.getIdCard());
-            if(jyPlatform != null && jyPlatform.getStatus() == 0){
-                jyUser.setPlatformId(jyPlatform.getId());
-                sysUserService.updateRoleId(sysUser.getId(),48L);
+        if(param.getIsJm()!=null && param.getIsJm() == 0){
+            if(StringUtils.isNotBlank(param.getIdCard()) ){
+                JyPlatform jyPlatform = jyPlatformService.getByIdCard(jyUser.getIdCard());
+                if(jyPlatform != null && jyPlatform.getStatus() == 0){
+                    jyUser.setPlatformId(jyPlatform.getId());
+                    sysUserService.updateRoleId(sysUser.getId(),48L);
+                }
             }
+            jyUser.setPlatformId(jyUser.getPlatformId()!=null && jyUser.getPlatformId() == 1 ? null :jyUser.getPlatformId());
+
         }
 
         jyUserService.saveOrUpdate(jyUser);