门店用户具备品保中心

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/impl/AnalysisSysUserService.java

@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Service("analysisDiyCustomerService")
 public class AnalysisSysUserService implements IAnalysisSysUserService {
@@ -1221,9 +1222,21 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
             user.setDeptId(deptId);
             user.setRoleIds(roleIds);
         }else{
+            Long[] roleIds = {roleId};
             Long[] roleIdsSfa = {roleIdsfa};
+            //合并数组的长度等于两个数组的长度
+            Long[] roles = new Long[roleIds.length+roleIdsSfa.length];
+            //循环赋值
+            for(int i =0;i<roles.length;i++){
+                if(i<roleIds.length) {
+                    roles[i]=roleIds[i];
+
+                }else {
+                    roles[i]=roleIdsSfa[i-roleIds.length];
+                }
+            }
             user.setDeptId(deptIdsfa);
-            user.setRoleIds(roleIdsSfa);
+            user.setRoleIds(roles);
         }
         //同步0
         user.setIsSync("0");

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserOrderAuthorServiceImpl.java

@@ -381,8 +381,6 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                        Customer customer=new Customer();
                        customer.setChainsName(info.getMainname1());
                        customer.setChainsCode(info.getMainkunnr());
-                       customer.setIsDelete("0");
-                       customer.setCreateTime(DateUtils.getNowDate());
                        customersList.add(customer);
                    }
                 }

suishenbang-system/src/main/resources/mapper/system/CustomerMapper.xml

@@ -71,7 +71,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userNo != null  and userNo != ''">user_no,</if>
             <if test="creditScore != null ">credit_score,</if>
             <if test="currentScore != null ">current_score,</if>
-           s
             <if test="lineId != null  and lineId != ''">line_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">