Merge remote-tracking branch 'origin/dev' into pre-production

blade-biz-common/src/main/java/org/springblade/common/utils/DefaultUserTokenConfig.java

@@ -2,7 +2,7 @@ package org.springblade.common.utils;
 
 public class DefaultUserTokenConfig {
 	/**
-	 *  默认用户的token 超时时间
+	 * 默认用户的token 超时时间
 	 */
-	public static final Long EXPIRE_TIME = 7 *24 * 60 * 60 * 1000L;
+	public static final Long EXPIRE_TIME = 7 * 24 * 60 * 60L;
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.java

@@ -50,5 +50,5 @@ public interface BasicdataBrandCategoryMapper extends BaseMapper<BasicdataBrandC
 	 * @param basicdataBrandCategory
 	 * @return
 	 */
-	IPage<BasicdataBrandCategoryVO> selectBasicdataBrandCategoryPage(IPage<BasicdataBrandCategoryVO> page, BasicdataBrandCategoryVO basicdataBrandCategory);
+	IPage<BasicdataBrandCategoryVO> selectBasicdataBrandCategoryPage(IPage<BasicdataBrandCategoryVO> page,@Param("param") BasicdataBrandCategoryVO basicdataBrandCategory);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.xml

@@ -41,6 +41,15 @@
         logpm_basicdata_brand_category AS lbbc
         LEFT JOIN logpm_basicdata_brand AS lbb ON lbbc.brand_id = lbb.id
         LEFT JOIN logpm_basicdata_category AS lbc  ON lbbc.category_id = lbc.id
+       <where>
+           lbbc.is_deleted = 0
+           <if test="param.brandName != null and param.brandName != ''">
+              AND  lbb.id = #{param.brandName}
+           </if>
+           <if test="param.name != null and param.name != ''">
+              AND  lbc.id = #{param.name}
+           </if>
+       </where>
         GROUP BY
         lbbc.id
     </select>