导购角色校验

gic-store-service/src/main/java/com/gic/store/service/impl/ClerkPositionServiceImpl.java

 package com.gic.store.service.impl;
 
 import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.GlobalInfo;
 import com.gic.store.constant.Constants;
 import com.gic.store.dao.mapper.TabClerkPositionMapper;
 import com.gic.store.dto.ClerkPositionDTO;
@@ -62,7 +63,11 @@ public class ClerkPositionServiceImpl implements ClerkPositionService {
 
     @Override
     public TabClerkPosition getByClerkPositionId(Integer clerkPositionId) {
-        return tabClerkPositionMapper.selectByPrimaryKey(clerkPositionId);
+        TabClerkPosition position = tabClerkPositionMapper.selectByPrimaryKey(clerkPositionId);
+        if (position != null && GlobalInfo.DATA_STATUS_NORMAL == position.getStatus()) {
+            return position;
+        }
+        return null;
     }
 
     @Override

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -911,17 +911,23 @@ public class StoreController extends DownloadUtils {
 
 
     private void convertTranMember(List<StoreDTO> result) {
-        this.hasTransMember();
-        RedissonClient redisClient = RedisUtil.getRedisClient();
-        RMap<Integer, String> cacheMap = redisClient.getMap("enterprise:store:transfermember:process");
-        String cacheStoreId = cacheMap.get(UserDetailUtils.getUserDetail().getEnterpriseId());
-        if (StringUtils.isBlank(cacheStoreId)) {
-            return;
-        }
-        List<Integer> storeIdList = Stream.of(cacheStoreId.split(",")).map(Integer::valueOf).collect(Collectors.toList());
-        for (StoreDTO storeDTO : result) {
-            storeDTO.setHasTransMember(storeIdList.contains(storeDTO.getStoreId()) ? 1 : 0);
+        try {
+
+            this.hasTransMember();
+            RedissonClient redisClient = RedisUtil.getRedisClient();
+            RMap<Integer, String> cacheMap = redisClient.getMap("enterprise:store:transfermember:process");
+            String cacheStoreId = cacheMap.get(UserDetailUtils.getUserDetail().getEnterpriseId());
+            if (StringUtils.isBlank(cacheStoreId)) {
+                return;
+            }
+            List<Integer> storeIdList = Stream.of(cacheStoreId.split(",")).map(Integer::valueOf).collect(Collectors.toList());
+            for (StoreDTO storeDTO : result) {
+                storeDTO.setHasTransMember(storeIdList.contains(storeDTO.getStoreId()) ? 1 : 0);
+            }
+        } catch (Exception e) {
+            logger.info("批量转移门店状态错误", e);
         }
+
     }
 
     /**