diff --git a/src/main/java/com/jingcheng/template/controller/AwardRecordController.java b/src/main/java/com/jingcheng/template/controller/AwardRecordController.java
index 3beaf60..d41a783 100644
--- a/src/main/java/com/jingcheng/template/controller/AwardRecordController.java
+++ b/src/main/java/com/jingcheng/template/controller/AwardRecordController.java
@@ -5,6 +5,7 @@ import com.jingcheng.template.model.AwardRecord;
 import com.jingcheng.template.service.AwardRecordService;
 import com.jingcheng.template.util.AjaxRequest;
 import com.jingcheng.template.util.AjaxResult;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,8 +26,8 @@ public class AwardRecordController extends BaseController<AwardRecordService, Aw
         AjaxResult ajaxResult = new AjaxResult();
         JSONObject jsonObject = ajaxRequest.getData();
         try {
-            Long userId = jsonObject.getLong("userId");
-            if (null == userId){
+            String userId = jsonObject.getString("userId");
+            if (StringUtils.isEmpty(userId)){
                 ajaxResult.setRetcode(AjaxResult.FAILED);
                 ajaxResult.setRetmsg("userId为空");
                 return ajaxResult;
@@ -48,9 +49,9 @@ public class AwardRecordController extends BaseController<AwardRecordService, Aw
         AjaxResult ajaxResult = new AjaxResult();
         JSONObject jsonObject = ajaxRequest.getData();
         try {
-            Long userId = jsonObject.getLong("userId");
+            String userId = jsonObject.getString("userId");
             String source = jsonObject.getString("source");
-            if (null == userId){
+            if (StringUtils.isEmpty(userId)){
                 ajaxResult.setRetcode(AjaxResult.FAILED);
                 ajaxResult.setRetmsg("userId为空");
                 return ajaxResult;
@@ -100,9 +101,9 @@ public class AwardRecordController extends BaseController<AwardRecordService, Aw
         AjaxResult ajaxResult = new AjaxResult();
         JSONObject jsonObject = ajaxRequest.getData();
         try {
-            Long userId = jsonObject.getLong("userId");
+            String userId = jsonObject.getString("userId");
             String source = jsonObject.getString("source");
-            if (null == userId){
+            if (StringUtils.isEmpty(userId)){
                 ajaxResult.setRetcode(AjaxResult.FAILED);
                 ajaxResult.setRetmsg("userId为空");
                 return ajaxResult;
diff --git a/src/main/java/com/jingcheng/template/mapper/UsersMapper.java b/src/main/java/com/jingcheng/template/mapper/UsersMapper.java
index 41a118f..8d46085 100644
--- a/src/main/java/com/jingcheng/template/mapper/UsersMapper.java
+++ b/src/main/java/com/jingcheng/template/mapper/UsersMapper.java
@@ -19,23 +19,4 @@ import java.util.List;
  */
 @Repository
 public interface UsersMapper extends CommonMapper<Users> {
-    List<Users> getUsersByConditions(@Param(value = "isCertificate")Integer isCertificate
-    ,@Param(value = "roleId")Integer roleId
-    ,@Param(value = "groupsId")Integer groupsId
-    ,@Param(value = "trainingId")Integer trainingId
-    ,@Param(value = "joinStartTime")String joinStartTime
-    ,@Param(value = "joinEndTime")String joinEndTime
-    ,@Param(value = "param")String param);
-
-    List<LinkedHashMap> getExportUsersByConditions(@Param(value = "isCertificate")Integer isCertificate
-            , @Param(value = "roleId")Integer roleId
-            , @Param(value = "groupsId")Integer groupsId
-            , @Param(value = "trainingId")Integer trainingId
-            , @Param(value = "joinStartTime")String joinStartTime
-            , @Param(value = "joinEndTime")String joinEndTime
-            , @Param(value = "param")String param);
-    List<Users> superAdminGetUsersList(@Param(value = "groupsId")Long groupsId
-            , @Param(value = "name")String name);
-
-    List<Users> getbanUsers(@Param(value = "groupsId")Long groupsId);
 }
diff --git a/src/main/java/com/jingcheng/template/model/AwardRecord.java b/src/main/java/com/jingcheng/template/model/AwardRecord.java
index bda5bd8..ef1cf22 100644
--- a/src/main/java/com/jingcheng/template/model/AwardRecord.java
+++ b/src/main/java/com/jingcheng/template/model/AwardRecord.java
@@ -13,7 +13,7 @@ public class AwardRecord extends BaseEntity{
      */
     private Integer awardType;
 
-    private Long userId;
+    private String userId;
 
     private String source;
 
diff --git a/src/main/java/com/jingcheng/template/model/Users.java b/src/main/java/com/jingcheng/template/model/Users.java
index 5e53463..8ffb056 100644
--- a/src/main/java/com/jingcheng/template/model/Users.java
+++ b/src/main/java/com/jingcheng/template/model/Users.java
@@ -21,6 +21,8 @@ public class Users extends BaseEntity {
 
     private Integer sex;
 
+    private String userId;
+
     private String userNo;//工号
 
     private String password;//密码
diff --git a/src/main/java/com/jingcheng/template/service/AwardRecordService.java b/src/main/java/com/jingcheng/template/service/AwardRecordService.java
index 09e998c..31b8669 100644
--- a/src/main/java/com/jingcheng/template/service/AwardRecordService.java
+++ b/src/main/java/com/jingcheng/template/service/AwardRecordService.java
@@ -12,7 +12,7 @@ public interface AwardRecordService<AwardRecord> extends BaseService<AwardRecord
      * @param userId
      * @return
      */
-    Integer getUserAwardRecordNum(Long userId);
+    Integer getUserAwardRecordNum(String userId);
 
     /**
      * 抽奖是否中奖
@@ -20,7 +20,7 @@ public interface AwardRecordService<AwardRecord> extends BaseService<AwardRecord
      * @param source
      * @return
      */
-    AjaxResult isAward(Long userId,String source);
+    AjaxResult isAward(String userId,String source);
 
     /**
      * 完善抽奖信息
@@ -39,5 +39,5 @@ public interface AwardRecordService<AwardRecord> extends BaseService<AwardRecord
     /**
      * 游戏失败调用主动插入一条
      */
-    AjaxResult insertFailRecord(Long userId,String source);
+    AjaxResult insertFailRecord(String userId,String source);
 }
diff --git a/src/main/java/com/jingcheng/template/service/impl/AwardRecordServiceImpl.java b/src/main/java/com/jingcheng/template/service/impl/AwardRecordServiceImpl.java
index 28c5a94..9d24b30 100644
--- a/src/main/java/com/jingcheng/template/service/impl/AwardRecordServiceImpl.java
+++ b/src/main/java/com/jingcheng/template/service/impl/AwardRecordServiceImpl.java
@@ -47,7 +47,7 @@ public class AwardRecordServiceImpl extends BaseServiceImpl<AwardRecordMapper, A
 
     @SneakyThrows
     @Override
-    public Integer getUserAwardRecordNum(Long userId) {
+    public Integer getUserAwardRecordNum(String userId) {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd");
         Date start = simpleDateFormat.parse(simpleDateFormat2.format(new Date())+ " 00:00:00");
@@ -63,7 +63,7 @@ public class AwardRecordServiceImpl extends BaseServiceImpl<AwardRecordMapper, A
 
     @SneakyThrows
     @Override
-    public AjaxResult isAward(Long userId,String source) {
+    public AjaxResult isAward(String userId,String source) {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd");
         Date start = simpleDateFormat.parse(simpleDateFormat2.format(new Date())+ " 00:00:00");
@@ -220,8 +220,14 @@ public class AwardRecordServiceImpl extends BaseServiceImpl<AwardRecordMapper, A
         Long total = page.getTotal();
         List<AwardRecordVo> awardRecordVoList = new ArrayList<>();
         for (AwardRecord awardRecord:awardRecordList){
-            Long userId = awardRecord.getUserId();
-            Users users = usersMapper.selectByPrimaryKey(userId);
+            String userId = awardRecord.getUserId();
+            Users findUsers = new Users();
+            findUsers.setUserId(userId);
+            findUsers.setState(Constants.STATE_VALID);
+            Users users = usersMapper.selectOne(findUsers);
+            if (null == users){
+                continue;
+            }
             AwardRecordVo awardRecordVo = new AwardRecordVo();
             awardRecordVo.setOpenId(users.getOpenId());
             if ( 0 == awardRecord.getAwardType()){
@@ -254,7 +260,7 @@ public class AwardRecordServiceImpl extends BaseServiceImpl<AwardRecordMapper, A
 
     @SneakyThrows
     @Override
-    public AjaxResult insertFailRecord(Long userId, String source) {
+    public AjaxResult insertFailRecord(String userId, String source) {
         AjaxResult ajaxResult = new AjaxResult();
         AwardRecord awardRecord = new AwardRecord();
         awardRecord.setUserId(userId);
diff --git a/src/main/java/com/jingcheng/template/service/impl/UsersServiceImpl.java b/src/main/java/com/jingcheng/template/service/impl/UsersServiceImpl.java
index 714c36f..63f057e 100644
--- a/src/main/java/com/jingcheng/template/service/impl/UsersServiceImpl.java
+++ b/src/main/java/com/jingcheng/template/service/impl/UsersServiceImpl.java
@@ -18,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
+import java.util.UUID;
 
 @Service("usersService")
 @Transactional
@@ -133,28 +134,29 @@ public class UsersServiceImpl extends BaseServiceImpl<UsersMapper, Users> implem
         findUsers.setOpenId(openId);
         findUsers.setState(Constants.STATE_VALID);
         Users users = usersMapper.selectOne(findUsers);
-        Long usersId ;
+        String usersId ;
         if (null == users){
             Users newUsers = new Users();
             newUsers.setOpenId(openId);
             newUsers.setNickName(nickName);
             newUsers.setHeadImgUrl(headimgurl);
+            newUsers.setUserId(UUID.randomUUID().toString());
             newUsers.setSex(sex);
             newUsers.setState(Constants.STATE_VALID);
             newUsers.setCreateDateTime(new Date());
             newUsers.setUpdateDateTime(new Date());
             usersMapper.insert(newUsers);
-            usersId = newUsers.getId();
+            usersId = newUsers.getUserId();
         }else {
             users.setNickName(nickName);
             users.setUpdateDateTime(new Date());
             users.setSex(sex);
             users.setHeadImgUrl(headimgurl);
             usersMapper.updateByPrimaryKeySelective(users);
-            usersId = users.getId();
+            usersId = users.getUserId();
         }
         JSONObject userJson = new JSONObject();
-        userJson.put("id",usersId);
+        userJson.put("usersId",usersId);
         userJson.put("openId",openId);
         userJson.put("subscribe",subscribe);
         userJson.put("nickname",nickName);