Merge branch 'dev' of GameCenter/game-center into master

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/RoleAssignRecordServiceImpl.java

@@ -296,25 +296,25 @@ public class RoleAssignRecordServiceImpl extends ServiceImpl<RoleAssignRecordMap
         LocalDateTime now = LocalDateTime.now();
         RoleOperate roleOperate = RoleOperate.builder().build();
         RoleOperate queryOne = roleOperateService.getOne(new LambdaQueryWrapper<RoleOperate>()
-                .eq(RoleOperate::getGameId, lastAssignRecord.getGameId())
-                .eq(RoleOperate::getServerId, lastAssignRecord.getServerId())
-                .eq(RoleOperate::getUserId, lastAssignRecord.getUserId())
-                .eq(RoleOperate::getRoleId, lastAssignRecord.getRoleId())
+                .eq(RoleOperate::getGameId, roleInfoAndAgentParam.getGameId())
+                .eq(RoleOperate::getServerId, roleInfoAndAgentParam.getServerId())
+                .eq(RoleOperate::getUserId, roleInfoAndAgentParam.getUserId())
+                .eq(RoleOperate::getRoleId, roleInfoAndAgentParam.getRoleId())
                 .eq(RoleOperate::getIsDelete, 0));
         if (null == queryOne) {
-            roleOperate.setGameId(lastAssignRecord.getGameId());
-            roleOperate.setServerId(lastAssignRecord.getServerId());
-            roleOperate.setUserId(lastAssignRecord.getUserId());
-            roleOperate.setRoleId(lastAssignRecord.getRoleId());
+            roleOperate.setGameId(roleInfoAndAgentParam.getGameId());
+            roleOperate.setServerId(roleInfoAndAgentParam.getServerId());
+            roleOperate.setUserId(roleInfoAndAgentParam.getUserId());
+            roleOperate.setRoleId(roleInfoAndAgentParam.getRoleId());
             roleOperate.setCreateBy(sysUserId);
             roleOperate.setCreateTime(now);
         } else {
             roleOperate = queryOne;
         }
-        roleOperate.setGsId(lastAssignRecord.getGsId());
-        roleOperate.setCustomerServiceId(lastAssignRecord.getCustomerServiceId());
-        roleOperate.setOperUserId(lastAssignRecord.getOperUserId());
-        roleOperate.setRemark(lastAssignRecord.getRemark());
+        roleOperate.setGsId(null == lastAssignRecord ? null : lastAssignRecord.getGsId());
+        roleOperate.setCustomerServiceId(null == lastAssignRecord ? null : lastAssignRecord.getCustomerServiceId());
+        roleOperate.setOperUserId(null == lastAssignRecord ? null : lastAssignRecord.getOperUserId());
+        roleOperate.setRemark(null == lastAssignRecord ? null : lastAssignRecord.getRemark());
         roleOperate.setUpdateBy(sysUserId);
         roleOperate.setUpdateTime(now);
         return roleOperate;