厨卫

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

@@ -363,10 +363,12 @@ public class AnalysisDiyCustomerComponent {
 
                     SysUser user = sysUserService.selectUserByLoginName(userid);
                     /*判断不是导购角色，更新经销商角色*/
-                    if (isManager == 1 || isManager == 2 || isManager == 3) {
-                        user.setRoleIds(roleIds);
-                        sysUserService.updateUser(user);
-                    }
+//                    if (isManager == 1 || isManager == 2 || isManager == 3) {
+//                        user.setRoleIds(roleIds);
+//                        sysUserService.updateUser(user);
+//                    }
+                    sysUserService.insertUserRole(user.getUserId(), roleIds[0]);
+
                     if (!user.getSysUserExt().getIsCustomerManager().contains(isManager + "") ||
                             !user.getSysUserExt().getCustomerCode().equals(customerCode) || !user.getSysUserExt().getOrgCode().equals(customerCode)) {
                         if (!user.getSysUserExt().getIsCustomerManager().contains(isManager + "")) {
@@ -501,6 +503,13 @@ public class AnalysisDiyCustomerComponent {
                     （首先查询当前用户职位，判断当前职位是否包含当前职位，不存在就更新，存在就不更新）*/
                     SysUser user = sysUserService.selectUserByLoginName(userid);
 
+                    if (diyNameSet.contains(userid)) {
+                        sysUserService.insertUserRole(user.getUserId(), roleIds[0]);
+                        sysUserService.insertUserRole(user.getUserId(), roleCwIds[0]);
+                    } else {
+                        sysUserService.insertUserRole(user.getUserId(), roleCwIds[0]);
+                    }
+
                     if (!user.getSysUserExt().getIsCustomerManager().contains(isManager + "") ||
                             !user.getSysUserExt().getCustomerCode().equals(customerCode) || !user.getSysUserExt().getOrgCode().equals(customerCode)) {
                         if (!user.getSysUserExt().getIsCustomerManager().contains(isManager + "")) {

suishenbang-system/src/main/java/com/dgtly/system/mapper/SysUserMapper.java

@@ -198,4 +198,6 @@ public interface SysUserMapper
     String getCustomNameByCode(String code);
 
     String selectSyncDateUser(@Param("type") Integer type);
+
+    int insertUserRole(@Param("userId") Long userId, @Param("roleId") Long roleId);
 }

suishenbang-system/src/main/java/com/dgtly/system/service/ISysUserService.java

@@ -261,4 +261,7 @@ public interface ISysUserService
     String getCustomNameByCode(String code);
 
     String selectSyncDateUser(Integer type);
+
+    void insertUserRole(Long userId, Long roleId);
+
 }

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

@@ -641,4 +641,10 @@ public class SysUserServiceImpl implements ISysUserService
     public String selectSyncDateUser(Integer type) {
         return userMapper.selectSyncDateUser(type);
     }
+
+    @Override
+    public void insertUserRole(Long userId, Long roleId) {
+        userMapper.insertUserRole(userId, roleId);
+    }
+
 }

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

@@ -436,4 +436,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select GROUP_CONCAT(su.login_name SEPARATOR '|') touser from sys_user su
 		left join sys_user_sync_data sus on sus.user_id = su.user_id  where sus.type = #{type}
 	</select>
+
+	<insert id="insertUserRole">
+		insert into sys_user_role where select user_id,${roleId} from sys_user_role where user_id = {userId} and role_id !=#{roleId}
+	</insert>
+
 </mapper>