1

src/main/java/com/neotel/smfcore/custom/hotayi20057/HotayiApi.java

@@ -31,9 +31,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 
 
 
 @Service
 @Service
@@ -136,6 +134,9 @@ public class HotayiApi extends BaseSmfApiListener {
         try {
         try {
             CodeBean codeBean = BarcodeRule.splitCodeAndSize(params.getCode());
             CodeBean codeBean = BarcodeRule.splitCodeAndSize(params.getCode());
             String reelId = codeBean.getCodeStr();
             String reelId = codeBean.getCodeStr();
+            if(reelId.endsWith("##")){
+                reelId=reelId.substring(0,reelId.length()-2);
+            }
 
 
             HotayiBean m6Bean=getM6Bean(reelId);
             HotayiBean m6Bean=getM6Bean(reelId);
             Map<String, Object> paramMap = new HashMap<>();
             Map<String, Object> paramMap = new HashMap<>();
@@ -391,6 +392,7 @@ public class HotayiApi extends BaseSmfApiListener {
                 user.setLanguage("en_US");
                 user.setLanguage("en_US");
                 user.setRoleId(role.getId());
                 user.setRoleId(role.getId());
                 user.setEnabled(true);
                 user.setEnabled(true);
+                user.setGroups( new HashSet<>());
                 if(userLevel==10){
                 if(userLevel==10){
                     user.setIsAdmin(true);
                     user.setIsAdmin(true);
                 }else{
                 }else{