Merge branch 'system-165' of uskycloud/usky-cloud into master

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysPlatformServiceImpl.java

@@ -97,8 +97,9 @@ public class SysPlatformServiceImpl extends AbstractCrudService<SysPlatformMappe
     @Transactional
     public void updatePlatformMenu(PlatformMenuVo platformMenuVo) {
         SysPlatform sysPlatform = new SysPlatform();
+        sysPlatform.setPlatformName(platformMenuVo.getPlatformName());
+        sysPlatform.setIcon(platformMenuVo.getIcon());
         if (platformMenuVo.getPlatformId().intValue() == 0) {
-            sysPlatform.setPlatformName(platformMenuVo.getPlatformName());
             sysPlatform.setCreateBy(SecurityUtils.getUsername());
             sysPlatform.setCreateTime(LocalDateTime.now());
             this.save(sysPlatform);
@@ -106,7 +107,6 @@ public class SysPlatformServiceImpl extends AbstractCrudService<SysPlatformMappe
             platformMenuVo.setPlatformId(fid.longValue());
         }else {
             sysPlatform.setId(platformMenuVo.getPlatformId().intValue());
-            sysPlatform.setPlatformName(platformMenuVo.getPlatformName());
             sysPlatform.setUpdateBy(SecurityUtils.getUsername());
             sysPlatform.setUpdateTime(LocalDateTime.now());
             this.updateById(sysPlatform);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -67,7 +67,6 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
      * @return 用户信息集合信息
      */
     @Override
-    @DataScope(deptAlias = "u")
     public List<SysUser> selectUserList(SysUser user) {
         user.setTenantId(SecurityUtils.getTenantId());
         user.setUserType("00");

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/PlatformMenuVo.java

@@ -31,6 +31,11 @@ public class PlatformMenuVo implements Serializable {
      */
     private String platformName;
 
+    /**
+     * 平台名称
+     */
+    private String icon;
+
     /**
      * 菜单ID
      */