Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-webapp-plug into developer

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

@@ -226,16 +226,14 @@ public class AppletConfigGoodsController {
         JSONObject jsonObject = null;
         JSONObject status = QueryConditionAssemblyUtil.createSimpleQueryNode("status", OperateEnum.OPERATE_EQ, 2);
         if (Constant.CHANNEL_CODE_MALL.equals(channelCode)) {
-            List<JSONObject> jsonObjectList = new ArrayList<>();
             status = QueryConditionAssemblyUtil.addQueryNodeForSiblin(status, QueryConditionAssemblyUtil.createSimpleQueryNode("upShelfTime", OperateEnum.OPERATE_LTE, new Date().getTime()), OperateEnum.OPERATE_AND);
-
         }
         if (goodsDomainId == null) {
             jsonObject = status;
         } else {
             jsonObject = QueryConditionAssemblyUtil.createSimpleQueryNode("goodsDomainId",
                     OperateEnum.OPERATE_EQ, goodsDomainId);
-            jsonObject = QueryConditionAssemblyUtil.addQueryNodeForSiblin(status, jsonObject, OperateEnum.OPERATE_EQ);
+            jsonObject = QueryConditionAssemblyUtil.addQueryNodeForSiblin(status, jsonObject, OperateEnum.OPERATE_AND);
         }
         if (StringUtils.isNotBlank(search)) {
             JSONObject goodsCodeJson = QueryConditionAssemblyUtil.createSimpleQueryNode("goodsCode",

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

@@ -104,6 +104,9 @@ public class GoodsSelectorController {
         if (goodsSelectorId == null) {
             ServiceResponse<GoodsRightsSelectorDTO> serviceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(),
                     Constant.TEST_ENTERPRISE_ID);
+            if (UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId() == null) {
+                return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "没有权限");
+            }
             if (serviceResponse.getResult() == null) {
                 return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "没有权限");
             }