bugfix

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

@@ -35,7 +35,8 @@ 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(), Constant.TEST_ENTERPRISE_ID);
+        ServiceResponse<GoodsRightsSelectorDTO> selectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(),
+                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/GoodsDomainController.java

@@ -54,7 +54,9 @@ 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);
+        ServiceResponse<GoodsRightsSelectorDTO> selectorDTOServiceResponse = goodsRightsSelectorApiService
+                .getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId()
+                        , 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);
@@ -63,14 +65,18 @@ public class GoodsDomainController {
         // 是否最高权限
         boolean isHighestRights = true;
         JSONObject json = null;
-        if (UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId() != null) {
+        if (UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin() != 1) {
             isHighestRights = false;
             if (selectorDTOServiceResponse.isSuccess()) {
                 GoodsRightsSelectorDTO goodsRightsSelectorDTO = selectorDTOServiceResponse.getResult();
                 if (goodsRightsSelectorDTO != null) {
-                    json = JSONObject.parseObject(goodsRightsSelectorDTO.getGoodsRightsDomains());
-                    if (json.isEmpty()) {
-                        isHighestRights = true;
+                    if (goodsRightsSelectorDTO.getHasRights() == 0) {
+                        json = JSONObject.parseObject(JSONObject.toJSONString(Collections.EMPTY_LIST));
+                    } else {
+                        json = JSONObject.parseObject(goodsRightsSelectorDTO.getGoodsRightsDomains());
+                        if (json.isEmpty()) {
+                            isHighestRights = true;
+                        }
                     }
                 }
             }

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

 package com.gic.plug.web.controller.goods;
 
+import com.gic.enterprise.utils.UserDetailUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -80,7 +81,8 @@ public class GoodsRightsSelectorController {
 
     @RequestMapping("/get-goods-rights-selector")
     public RestResponse getGoodsRightsSelector(Long goodsRightsSelectorId) {
-        ServiceResponse<GoodsRightsSelectorDTO> serviceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(goodsRightsSelectorId, Constant.TEST_ENTERPRISE_ID);
+        ServiceResponse<GoodsRightsSelectorDTO> serviceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(goodsRightsSelectorId,
+                Constant.TEST_ENTERPRISE_ID, UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
         if (serviceResponse.isSuccess()) {
             GoodsRightsSelectorDTO goodsRightsSelectorDTO = serviceResponse.getResult();
             return RestResponse.success(EntityUtil.changeEntityByOrika(GoodsRightsSelectorVO.class, goodsRightsSelectorDTO));

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

@@ -60,7 +60,8 @@ 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);
+        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId()
+                , Constant.TEST_ENTERPRISE_ID, UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
         if (!goodsRightsSelectorDTOServiceResponse.isSuccess()) {
             return RestResponse.failure(goodsRightsSelectorDTOServiceResponse.getCode(), goodsRightsSelectorDTOServiceResponse.getMessage());
         }
@@ -81,7 +82,8 @@ public class GoodsSelectorController {
     public RestResponse goodsSelectorShow(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);
+        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(),
+                Constant.TEST_ENTERPRISE_ID, UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
         if (!goodsRightsSelectorDTOServiceResponse.isSuccess()) {
             return RestResponse.failure(goodsRightsSelectorDTOServiceResponse.getCode(), goodsRightsSelectorDTOServiceResponse.getMessage());
         }
@@ -103,7 +105,7 @@ public class GoodsSelectorController {
     public RestResponse changeGoodsRightsForSelector(Long goodsSelectorId) {
         if (goodsSelectorId == null) {
             ServiceResponse<GoodsRightsSelectorDTO> serviceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(),
-                    Constant.TEST_ENTERPRISE_ID);
+                    Constant.TEST_ENTERPRISE_ID, UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
             if (UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId() == null) {
                 return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "没有权限");
             }
@@ -116,7 +118,8 @@ public class GoodsSelectorController {
             goodsRightsSelectorDTO.setGoodsRightsSearchValue(serviceResponse.getResult().getGoodsRightsSearchValue());
             return RestResponse.success(goodsRightsSelectorDTO);
         }
-        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(), Constant.TEST_ENTERPRISE_ID);
+        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(),
+                Constant.TEST_ENTERPRISE_ID, UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
         if (!goodsRightsSelectorDTOServiceResponse.isSuccess()) {
             return RestResponse.failure(goodsRightsSelectorDTOServiceResponse.getCode(), goodsRightsSelectorDTOServiceResponse.getMessage());
         }