Эх сурвалжийг харах

1、登录权限校验调整;
2、专场初始代码;

zk 2 жил өмнө
parent
commit
3a3f02aeff

+ 2 - 0
sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/RequestCheckFilter.java

@@ -175,6 +175,8 @@ public class RequestCheckFilter implements Filter {
 //            return;
 //        }
 
+        List<Long> authUserIdList = null; //redis 获取客户经理绑定企业ID
+        loginUserInfo.setAuthEntIdList(authUserIdList);
         LoginUserHolder.set(loginUserInfo);
         LoginEntHolder.set(loginEntInfo);
         RedissonUtils.putString(Global.getFullUserLoginKey(NumberUtils.parseInt(systemType), loginUserInfo.getId()), JSON.toJSONString(loginUserInfo), Global.APP_TOKEN_EXPIRE);

+ 16 - 0
sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/context/LoginUserHolder.java

@@ -157,4 +157,20 @@ public class LoginUserHolder {
         return authUserIdList;
     }
 
+    /**
+     * 运营端客户经理(用户)关联企业
+     * @return 企业ID集合
+     */
+    public static List<Long> getAuthEntIdList(){
+        if (LONGIN_USER_HOLDER.get() == null) {
+            return new ArrayList<>();
+        }
+        List<Long> authUserIdList = LONGIN_USER_HOLDER.get().getAuthEntIdList();
+        if (CollectionUtils.isEmpty(authUserIdList)) {
+            return new ArrayList<>();
+        }
+
+        return authUserIdList;
+    }
+
 }

+ 8 - 0
sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/model/LoginUserInfo.java

@@ -57,8 +57,16 @@ public class LoginUserInfo {
      */
     private String entName;
 
+    /**
+     * 用户权限
+     */
     private List<Long> authUserIdList;
 
+    /**
+     * 运营端客户经理(用户)关联企业
+     */
+    private List<Long> authEntIdList;
+
     public LoginUserInfo() {
     }
 

+ 1 - 1
sckw-modules/sckw-product/src/main/resources/mapper/KwpGoodsMapper.xml

@@ -20,7 +20,7 @@
                 and create_time &lt;= #{queryParam.endCreateTime}
             </if>
             <if test="queryParam.status != null and queryParam.status.size() > 0 ">
-                and status in
+                and status in ()
                 <foreach item="item" index="index" collection="#{queryParam.status}" open="(" separator="," close=")">
                     #{item}
                 </foreach>

+ 15 - 0
sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsSpecialController.java

@@ -0,0 +1,15 @@
+package com.sckw.system.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @desc 专场
+ * @author zk
+ * @date 2023/12/11 0011
+ */
+@RestController
+@RequestMapping("/kwsSpecial")
+public class KwsSpecialController {
+
+}

+ 15 - 0
sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsEntSpecialDao.java

@@ -0,0 +1,15 @@
+package com.sckw.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.system.model.KwsEntSpecial;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 专场与企业关联信息
+ * @author zk
+ * @date 2023/12/11 0011
+ */
+@Mapper
+public interface KwsEntSpecialDao extends BaseMapper<KwsEntSpecial> {
+
+}

+ 15 - 0
sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsSpecialDao.java

@@ -0,0 +1,15 @@
+package com.sckw.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.system.model.KwsSpecial;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 专场信息
+ * @author zk
+ * @date 2023/12/11 0011
+ */
+@Mapper
+public interface KwsSpecialDao extends BaseMapper<KwsSpecial> {
+
+}

+ 23 - 0
sckw-modules/sckw-system/src/main/java/com/sckw/system/model/KwsEntSpecial.java

@@ -0,0 +1,23 @@
+package com.sckw.system.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+
+/**
+ * @desc 专场与企业关联信息
+ * @author zk
+ * @date 2023/12/11 0011
+ */
+@Data
+public class KwsEntSpecial extends BaseModel {
+
+    /**
+     * 专场ID
+     */
+    private Long specialId;
+
+    /**
+     * 专场企业ID
+     */
+    private Long entId;
+}

+ 33 - 0
sckw-modules/sckw-system/src/main/java/com/sckw/system/model/KwsSpecial.java

@@ -0,0 +1,33 @@
+package com.sckw.system.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+
+/**
+ * @desc 专场信息
+ * @author zk
+ * @date 2023/12/11 0011
+ */
+@Data
+public class KwsSpecial extends BaseModel {
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 开户经理
+     */
+    private Long manager;
+
+    /**
+     * 专场编号
+     */
+    private String code;
+
+    /**
+     * 专场主企业ID
+     */
+    private Long entId;
+}

+ 13 - 0
sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsSpecialService.java

@@ -0,0 +1,13 @@
+package com.sckw.system.service;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @desc 专场
+ * @author zk
+ * @date 2023/12/11 0011
+ */
+@Service
+public class KwsSpecialService {
+
+}