BUGFIX

src/main/java/com/gic/plug/web/controller/goods/GoodsBrandController.java

@@ -35,7 +35,9 @@ public class GoodsBrandController {
 
     @RequestMapping("/goods-brand-list")
     public RestResponse goodsBrandList(int pageSize, int currentPage, String search, Long goodsDomainId, String channelCode) {
-        ServiceResponse<GoodsRightsSelectorDTO> selectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(),
+        Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null :
+                UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
+        ServiceResponse<GoodsRightsSelectorDTO> selectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
                 Constant.TEST_ENTERPRISE_ID, UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
         if (!selectorDTOServiceResponse.isSuccess() || selectorDTOServiceResponse.getResult() == null ||
                 selectorDTOServiceResponse.getResult().getHasRights() == Constant.NO) {

src/main/java/com/gic/plug/web/controller/goods/GoodsDomainController.java

@@ -54,9 +54,10 @@ public class GoodsDomainController {
     */
     @RequestMapping("/get-all-goods-domain-list")
     public RestResponse getAllGoodsDomianList() {
-        ServiceResponse<GoodsRightsSelectorDTO> selectorDTOServiceResponse = goodsRightsSelectorApiService
-                .getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId()
-                        , Constant.TEST_ENTERPRISE_ID, UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
+        Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null :
+                UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
+        ServiceResponse<GoodsRightsSelectorDTO> selectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
+                Constant.TEST_ENTERPRISE_ID, UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
         if (!selectorDTOServiceResponse.isSuccess() || selectorDTOServiceResponse.getResult() == null ||
                 selectorDTOServiceResponse.getResult().getHasRights() == Constant.NO) {
             return RestResponse.success(Collections.EMPTY_LIST);

src/main/java/com/gic/plug/web/controller/goods/GoodsSelectorController.java

@@ -65,8 +65,10 @@ public class GoodsSelectorController {
     public RestResponse goodsSelectorSave(GoodsSelectorSaveQO goodsSelectorSaveQO) {
         GoodsSelectorDTO goodsSelectorDTO = EntityUtil.changeEntityByOrika(GoodsSelectorDTO.class, goodsSelectorSaveQO);
         goodsSelectorDTO.setEnterpriseId(Constant.TEST_ENTERPRISE_ID);
-        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId()
-                , Constant.TEST_ENTERPRISE_ID, UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
+        Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null :
+                UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
+        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
+                Constant.TEST_ENTERPRISE_ID, UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
         if (!goodsRightsSelectorDTOServiceResponse.isSuccess()) {
             return RestResponse.failure(goodsRightsSelectorDTOServiceResponse.getCode(), goodsRightsSelectorDTOServiceResponse.getMessage());
         }
@@ -85,13 +87,11 @@ public class GoodsSelectorController {
 
     @RequestMapping("goods-selector-show")
     public RestResponse goodsSelectorShow(GoodsSelectorSaveQO goodsSelectorSaveQO) {
-        if (UserDetailUtils.getUserDetail() == null) {
-            return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "请重新登录");
-        }
-        log.info("getUserDetail:{}",JSONObject.toJSONString(UserDetailUtils.getUserDetail()));
         GoodsSelectorDTO goodsSelectorDTO = EntityUtil.changeEntityByOrika(GoodsSelectorDTO.class, goodsSelectorSaveQO);
         goodsSelectorDTO.setEnterpriseId(Constant.TEST_ENTERPRISE_ID);
-        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(),
+        Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null :
+                UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
+        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
                 Constant.TEST_ENTERPRISE_ID, UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
         if (!goodsRightsSelectorDTOServiceResponse.isSuccess()) {
             return RestResponse.failure(goodsRightsSelectorDTOServiceResponse.getCode(), goodsRightsSelectorDTOServiceResponse.getMessage());
@@ -113,12 +113,9 @@ public class GoodsSelectorController {
     @RequestMapping("change-goods-rights-for-selector")
     public RestResponse changeGoodsRightsForSelector(Long goodsSelectorId) {
         if (goodsSelectorId == null) {
-            if (UserDetailUtils.getUserDetail().getUserInfo() == null) {
-                return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "没有权限");
-            }
-            log.info("getUserDetail:{}", JSONObject.toJSONString(UserDetailUtils.getUserDetail()));
-            ServiceResponse<GoodsRightsSelectorDTO> serviceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(),
-                    Constant.TEST_ENTERPRISE_ID, UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
+            Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null:UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
+            ServiceResponse<GoodsRightsSelectorDTO> serviceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
+                                Constant.TEST_ENTERPRISE_ID, UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
             if (serviceResponse.getResult() == null) {
                 return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "没有权限");
             }
@@ -128,7 +125,9 @@ public class GoodsSelectorController {
             goodsRightsSelectorDTO.setGoodsRightsSearchValue(serviceResponse.getResult().getGoodsRightsSearchValue());
             return RestResponse.success(goodsRightsSelectorDTO);
         }
-        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(),
+        Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null :
+                UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
+        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
                 Constant.TEST_ENTERPRISE_ID, UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
         if (!goodsRightsSelectorDTOServiceResponse.isSuccess()) {
             return RestResponse.failure(goodsRightsSelectorDTOServiceResponse.getCode(), goodsRightsSelectorDTOServiceResponse.getMessage());