添加应用分类列表

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -297,6 +297,8 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
     @Override
     public void updateUserList(List<UserPdu> list) {
         //更新本地用户信息，并且更新用户站点树
+
+        //如果用户未有所属站点 则不更新
         for (UserPdu user : list) {
             UserEntity tempUser = this.selectOne(new UserQuery().loginName(user.getLoginName()));
             if (ObjectUtils.isEmpty(tempUser)) {
@@ -305,18 +307,22 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
                 entity.initAttrValue();
                 BeanUtils.copyProperties(user, entity, BeanUtil.getNullPropertyNames(user));
                 this.save(entity);
-                Context context = new Context();
-                context.setUser(entity);
-                ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
+                if (!ObjectUtils.isEmpty(entity.getSiteIds())) {
+                    Context context = new Context();
+                    context.setUser(entity);
+                    ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
+                }
             } else {
                 //更新
                 UserEntity userEntity = new UserEntity();
-                BeanUtils.copyProperties(user, userEntity, new String[]{"loginPwd","loginName", "userType", "status", "lastLoginTime", "lastLoginAddress"});
+                BeanUtils.copyProperties(user, userEntity, new String[]{"loginPwd", "loginName", "userType", "status", "lastLoginTime", "lastLoginAddress"});
                 userEntity.setId(tempUser.getId());
                 this.updateWidthDao(userEntity);
-                Context context = new Context();
-                context.setUser(userEntity);
-                ThreadPool.getInstance().execute(new SyncTreeSiteThread( context));
+                if (!ObjectUtils.isEmpty(userEntity.getSiteIds())) {
+                    Context context = new Context();
+                    context.setUser(userEntity);
+                    ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
+                }
             }
         }
     }

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -185,7 +185,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
     @Override
     protected void saveAfter(SiteEntity entity, Context context) throws AppException {
-        log.info("站点更新1");
         //刷新站点树
         //ThreadPool.getInstance().execute(new SyncTreeSiteThread(this,context));
         Rest<String> rest = userFeign.synchSiteAuth();
@@ -364,7 +363,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
     @Override
     public List<SiteTreeSelect> getSiteTree(Context context) {
-        List<SiteTreeSelect> siteTreeSelects = siteTreeMap.get(context.getUser().getId());
+       // List<SiteTreeSelect> siteTreeSelects = siteTreeMap.get(context.getUser().getId());
         List<SiteTreeSelect> collect = getSiteTreeSelects(context.getUser().getId().toString());
         log.info("siteTree:{}", JSON.toJSONString(collect));
         if (!ObjectUtils.isEmpty(collect)) {
@@ -389,7 +388,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         if (ObjectUtils.isEmpty(siteTreeSelectStr)) {
             return new ArrayList<>();
         }
-
         JSONArray jsonArray = JSON.parseArray(siteTreeSelectStr);
         if (ObjectUtils.isEmpty(jsonArray)) {
             return new ArrayList<>();
@@ -553,7 +551,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
     @Override
     public void setSiteTree(List<SiteTreeSelect> list, Context context) {
-        siteTreeMap.put(context.getUser().getId(), list);
+       // siteTreeMap.put(context.getUser().getId(), list);
         //存放到redis中去
         cacheService.hset(USER_SITE_TREE, context.getUser().getId().toString(), JSON.toJSONString(list));
     }