修改shoptpye刷新问题

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

@@ -15,10 +15,8 @@ import com.dgtly.sync.mapper.MetaEmployeeMapper;
 import com.dgtly.sync.mapper.SyncFailDetailMapper;
 import com.dgtly.sync.service.IAnalysisSysUserService;
 import com.dgtly.sync.service.ISyncLogService;
-import com.dgtly.system.domain.SysDictData;
-import com.dgtly.system.domain.SysUser;
-import com.dgtly.system.domain.SysUserExt;
-import com.dgtly.system.domain.SysUserRole;
+import com.dgtly.system.domain.*;
+import com.dgtly.system.mapper.SysRoleMapper;
 import com.dgtly.system.mapper.SysUserExtMapper;
 import com.dgtly.system.mapper.SysUserRoleMapper;
 import com.dgtly.system.service.ISysConfigService;
@@ -57,8 +55,15 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
     @Autowired
     private SysUserRoleMapper userRoleMapper;
     @Autowired
+    @SuppressWarnings("all")
+    private SysRoleMapper roleMapper;
+    @Autowired
     private SysUserExtMapper sysUserExtMapper;
 
+    private  String [] paintRoleKeys = {"shopStoneLikePaint"};
+
+    private  String [] goldPoleKeys = {"goldShopUser"};;
+
     /**
      * 解析DIY用户数据  异步执行（new）
      * @param packageId
@@ -1791,6 +1796,15 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(user.getUserId());
                 ur.setRoleId(roleId);
+                SysRole sysRole =  roleMapper.selectRoleById(ur.getRoleId());
+                if (sysRole != null){
+                    if (Arrays.asList(paintRoleKeys).contains(sysRole.getRoleKey())){
+                        ur.setShopType("0");
+                    }
+                    if (Arrays.asList(goldPoleKeys).contains(sysRole.getRoleKey())){
+                        ur.setShopType("1");
+                    }
+                }
                 list.add(ur);
             }
             if (list.size() > 0)

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

@@ -49,6 +49,10 @@ public class SysRoleServiceImpl implements ISysRoleService
     @SuppressWarnings("all")
     private SysRoleDeptMapper roleDeptMapper;
 
+    private  String [] paintRoleKeys = {"shopStoneLikePaint"};
+
+    private  String [] goldPoleKeys = {"goldShopUser"};;
+
     /**
      * 根据条件分页查询角色数据
      * 
@@ -377,6 +381,15 @@ public class SysRoleServiceImpl implements ISysRoleService
             SysUserRole ur = new SysUserRole();
             ur.setUserId(userId);
             ur.setRoleId(roleId);
+            SysRole sysRole =  roleMapper.selectRoleById(ur.getRoleId());
+            if (sysRole != null){
+                if (Arrays.asList(paintRoleKeys).contains(sysRole.getRoleKey())){
+                    ur.setShopType("0");
+                }
+                if (Arrays.asList(goldPoleKeys).contains(sysRole.getRoleKey())){
+                    ur.setShopType("1");
+                }
+            }
             list.add(ur);
         }
         return userRoleMapper.batchUserRole(list);

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

@@ -72,6 +72,10 @@ public class SysUserServiceImpl implements ISysUserService
     @Value(value = "${spring.esb.esbShopStoneLikePaintUser}")
     private String esbShopStoneLikePaintUserUrl;
 
+    private  String [] paintRoleKeys = {"shopStoneLikePaint"};
+
+    private  String [] goldPoleKeys = {"goldShopUser"};;
+
 
 
     /**
@@ -368,6 +372,15 @@ public class SysUserServiceImpl implements ISysUserService
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(user.getUserId());
                 ur.setRoleId(roleId);
+                SysRole sysRole =  roleMapper.selectRoleById(ur.getRoleId());
+                if (sysRole != null){
+                    if (Arrays.asList(paintRoleKeys).contains(sysRole.getRoleKey())){
+                        ur.setShopType("0");
+                    }
+                    if (Arrays.asList(goldPoleKeys).contains(sysRole.getRoleKey())){
+                        ur.setShopType("1");
+                    }
+                }
                 list.add(ur);
             }
             if (list.size() > 0)