zhouweidong 发布系统代码 [ibz-ou，统一组织单位]

app_web/src/pages/ou/sys-dept-member-grid-view/sys-dept-member-grid-view-base.vue

@@ -891,7 +891,7 @@ export default class SysDeptMemberGridViewBase extends Vue {
             'resAppKey':'userid'},
             {view:{viewname:'sys-department-mpickup-view',height: 0,width: 0,title: '部门数据多项选择视图'},
             res:['SysDepartment'],
-            'resAppKey':'userid'}
+            'resAppKey':'deptid'}
         ];
         if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
             this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });

ibzou-util/src/main/java/cn/ibizlab/util/cache/listener/RedisMessageListener.java

@@ -8,6 +8,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.util.StringUtils;
+import org.springframework.util.ObjectUtils;
 import java.util.Map;
 import cn.ibizlab.util.cache.cache.LayeringCache;
 import cn.ibizlab.util.enums.RedisChannelTopic;
@@ -34,20 +35,25 @@ public class RedisMessageListener extends MessageListenerAdapter {
         if(result instanceof  Map){
             map= (Map<String, Object>) result;
         }
-        if(StringUtils.isEmpty(map)|| (!map.containsKey("cacheName"))|| (!map.containsKey("key"))){
+        if(StringUtils.isEmpty(map)|| (!map.containsKey("cacheName"))){
             log.debug("解析缓存数据失败，无法获取指定值!");
             return ;
         }
         log.debug("redis消息订阅者接收到频道【{}】发布的消息。消息内容：{}", channelTopic.getChannelTopicStr(), result.toString());
         String cacheName = (String) map.get("cacheName");
-        Object key = map.get("key");
         Cache cache = cacheManager.getCache(cacheName);// 根据缓存名称获取多级缓存
         if (cache != null && cache instanceof LayeringCache) { // 判断缓存是否是多级缓存
             switch (channelTopic) {
                 case REDIS_CACHE_DELETE_TOPIC: // 获取一级缓存，并删除一级缓存数据
-                    ((LayeringCache) cache).getFirstCache().evict(key);
-                    ((LayeringCache) cache).getSecondCache().evict(key);
-                    log.debug("同步删除缓存{}数据,key:{},", cacheName, key.toString());
+                    Object cacheKey = map.get("key");
+                    if(!ObjectUtils.isEmpty(cacheKey)){
+                        ((LayeringCache) cache).getFirstCache().evict(cacheKey);
+                        ((LayeringCache) cache).getSecondCache().evict(cacheKey);
+                        log.debug("同步删除缓存{}数据,key:{},", cacheName, cacheKey.toString());
+                    }
+                    else{
+                        log.debug("同步删除缓存失败，{}缓存键值为空!",cacheName);
+                    }
                     break;
                 case REDIS_CACHE_CLEAR_TOPIC:// 获取一级缓存，并删除一级缓存数据
                     ((LayeringCache) cache).getFirstCache().clear();