门店查询

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/GicDepartmentController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,11 +60,17 @@ public class GicDepartmentController extends WebBaseController{
             String clerkId = loginUser.getClerkId() ;
             ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
             String storeWidgetId = clerk.getStoreWidgetId() ;
-            StoreWidgetDTO storeWidgetDTO = this.storeWidgetService.getStoreWidgetBykey(storeWidgetId);
-            if(0 != storeWidgetDTO.getSelectType() || 4!=storeWidgetDTO.getSelectType()) {
+            int selectType = 0 ; 
+            if(StringUtils.isNotBlank(storeWidgetId)) {
+                StoreWidgetDTO storeWidgetDTO = this.storeWidgetService.getStoreWidgetBykey(storeWidgetId);
+                if(null != storeWidgetDTO) {
+                    selectType = storeWidgetDTO.getSelectType() ;
+                }
+            }
+            if(0 != selectType && 4!=selectType) {
                 return this.resultResponse(HaoBanErrCode.ERR_10031) ;
             }
-            if(4==storeWidgetDTO.getSelectType()) {
+            if(4==selectType) {
                 Page page = new Page();
                 page.setPageSize(3000);
                 page.setCurrentPage(1);