添加商户id

gic-platform-auth-service/src/main/resources/mapper/TabAuditedGroupUserRelMapper.xml

@@ -173,7 +173,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_audited_group_user_rel
-    where status = 1
+    <where>
     <if test="auditedGroupId != null ">
         and audited_group_id = #{auditedGroupId}
     </if>
@@ -183,17 +183,21 @@
         #{item}
       </foreach>
     </if>
+    and status = 1
+    </where>
   </select>
   <select id="listAuditedGroupByUserId" resultType="java.lang.Integer">
     select
     audited_group_id
     from tab_audited_group_user_rel
-    where status = 1
+    <where>
     <if test="enterpriseId != null ">
         and enterprise_id = #{enterpriseId}
     </if>
     <if test="userId != null ">
         and user_id = #{userId}
     </if>
+    and status = 1
+    </where>
   </select>
 </mapper>
\ No newline at end of file

gic-platform-auth-service/src/main/resources/mapper/TabAuditorMapper.xml

@@ -206,10 +206,12 @@
     select
     <include refid="Base_Column_List" />
     from tab_auditor
-    where status = 1
-    and is_use = 1
+    <where>
     <if test="openid != null and openid != '' ">
         and openid = #{openid}
     </if>
+      and is_use = 1
+      and status = 1
+    </where>
   </select>
 </mapper>
\ No newline at end of file

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java

@@ -192,7 +192,7 @@ public class ResourceController {
                 SmsSignResourceDTO smsSignResourceDTO = JSON.parseObject(dto.getSmsSignResourceJson(), SmsSignResourceDTO.class);
                 vo.setSmsResourceJSON(smsSignResourceDTO);
             }
-            ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.getGoodsRightsSelector(response.getResult().getGoodsResourceId());
+            ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.getGoodsRightsSelector(response.getResult().getGoodsResourceId(), UserDetailUtils.getUserDetail().getEnterpriseId());
             if(goodsResponse.isSuccess()){
                 if(goodsResponse.getResult() != null){
                     vo.setGoodsResouce(EntityUtil.changeEntityByJSON(GoodsResouceVO.class, goodsResponse.getResult()));

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/UnionEnterpriseController.java

@@ -3,7 +3,6 @@ package com.gic.auth.web.controller;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.constant.ResourceTypeEnum;
-import com.gic.auth.dto.AuthCodeDTO;
 import com.gic.auth.dto.UnionEnterpriseDTO;
 import com.gic.auth.dto.UnionEnterpriseResourceDTO;
 import com.gic.auth.dto.UserDTO;
@@ -11,7 +10,6 @@ import com.gic.auth.service.AuthCodeApiService;
 import com.gic.auth.service.UnionEnterpriseApiService;
 import com.gic.auth.service.UserApiService;
 import com.gic.auth.web.qo.PageQO;
-import com.gic.auth.web.qo.StoreResouceQO;
 import com.gic.auth.web.qo.UnionEnterpriseQO;
 import com.gic.auth.web.vo.GoodsResouceVO;
 import com.gic.auth.web.vo.StoreResouceVO;
@@ -32,7 +30,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -104,7 +101,7 @@ public class UnionEnterpriseController {
                     vo.setStoreResouce(storeResouceVO);
                 }
             }
-            ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.getGoodsRightsSelector(response.getResult().getGoodsResourceId());
+            ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.getGoodsRightsSelector(response.getResult().getGoodsResourceId(), UserDetailUtils.getUserDetail().getEnterpriseId());
             if(goodsResponse.isSuccess()){
                 if(goodsResponse.getResult() != null){
                     vo.setGoodsResouce(EntityUtil.changeEntityByJSON(GoodsResouceVO.class, goodsResponse.getResult()));