1

src/main/java/com/fdkankan/manage/entity/JyUser.java

@@ -1,10 +1,7 @@
 package com.fdkankan.manage.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Getter;
@@ -80,6 +77,6 @@ public class JyUser implements Serializable {
     @TableField("status")
     private Integer status;
 
-    @TableField("platform_id")
+    @TableField(value = "platform_id",updateStrategy = FieldStrategy.IGNORED)
     private Integer platformId;
 }

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

@@ -205,10 +205,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
             }
         }
 
-        boolean init = false;
         if(jyUser == null){
             jyUser = new JyUser();
-            init = true;
         }
 
         User user = this.addUser(jyUser.getUserId(),passwordMd5, param.getRyNo(), param.getNickName());
@@ -223,9 +221,13 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         jyUser.setPhone(param.getPhone());
         jyUser.setIdCard(param.getIdCard());
         jyUser.setIsJm(param.getIsJm());
-        if(jyUser.getPlatformId() == null){
-            jyUser.setPlatformId(param.getIsJm() != null && param.getIsJm() == 1? 1 : null);
+        if(param.getIsJm() != null && param.getIsJm() == 1){
+            if(sysUser.getRoleId() != 47L){
+                sysUserService.updateRoleId(sysUser.getId(),47L);
+            }
+            jyUser.setPlatformId(1);
         }
+
         if(param.getIsJm() != null && param.getIsJm() ==0 ){
             JyPlatformUserWait platformUserWait = platformUserWaitService.getByName(jyUser.getRyNickName());
             if(platformUserWait != null){
@@ -233,15 +235,16 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
                 platformUserWaitService.del(platformUserWait.getId());
             }
         }
-        jyUserService.saveOrUpdate(jyUser);
-
-        if(init && StringUtils.isNotBlank(param.getIdCard()) && param.getIsJm()!=null && param.getIsJm() != 1){
+        if(StringUtils.isNotBlank(param.getIdCard()) && param.getIsJm()!=null && param.getIsJm() == 0){
             JyPlatform jyPlatform = jyPlatformService.getByIdCard(jyUser.getIdCard());
             if(jyPlatform != null && jyPlatform.getStatus() == 0){
-                jyUserService.updatePlatformId(jyUser.getId(),jyPlatform.getId());
+                jyUser.setPlatformId(jyPlatform.getId());
                 sysUserService.updateRoleId(sysUser.getId(),48L);
             }
         }
+
+        jyUserService.saveOrUpdate(jyUser);
+
     }