From ebae0c1137ba96d38e5b2323577129d2c9ff2e6e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 五月 2025 09:45:59 +0800
Subject: [PATCH] 1、优化配置文件; 2、优化ID生成器代码; 3、修改注释; 4、修改权限初始化时算法; 5、导出Excel文件功能归为一个新类; 6、工站数据库存入验空修改;

---
 pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
index 5bc6c74..2f1a20d 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
@@ -41,6 +41,9 @@
     <select id="selectProNameById" parameterType="java.lang.Long" resultType="java.lang.String">
         select name proName from plt_product where id=#{proId,jdbcType=BIGINT}
     </select>
+    <select id="selectProTypeById" parameterType="java.lang.Long" resultType="java.lang.String">
+        select type proName from plt_product where id=#{proId,jdbcType=BIGINT}
+    </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap2">
     <!--@mbg.generated-->
     select
@@ -65,7 +68,7 @@
         <if test="type != null">
           `type`,
         </if>
-        <if test="image != null">
+        <if test="image!= null">
           image,
         </if>
         <if test="director != null">
@@ -97,7 +100,7 @@
         <if test="type != null">
           #{type,jdbcType=VARCHAR},
         </if>
-        <if test="image != null">
+        <if test="image!= null">
           #{image,jdbcType=BIGINT},
         </if>
         <if test="director != null">
@@ -127,7 +130,7 @@
       <if test="type != null">
         `type` = #{type,jdbcType=VARCHAR},
       </if>
-      <if test="image != null">
+      <if test="image!= null">
         image = #{image,jdbcType=BIGINT},
       </if>
       <if test="director != null">
@@ -159,7 +162,7 @@
     where p.deleted!=1
     <trim prefix="and " suffixOverrides="and">
       <if test="type != null and type != ''">
-        p.type = #{type,jdbcType=VARCHAR} and
+        p.type like concat('%', #{type}, '%') and
       </if>
     </trim>
     order by id desc
@@ -176,7 +179,7 @@
     where p.deleted!=1
     <trim prefix="and " suffixOverrides="and">
       <if test="type != null and type != ''">
-        p.type = #{type,jdbcType=VARCHAR} and
+        p.type like concat('%', #{type}, '%') and
       </if>
     </trim>
   </select>
@@ -199,7 +202,7 @@
         </include>
         FROM
         <if test="orderId != null and orderId != ''">
-            (select * from pr_order_item WHERE deleted!=1 AND order_id = #{orderId,jdbcType=BIGINT}) poi,
+            (select distinct(pro_id) as pro_id from pr_order_item WHERE deleted!=1 AND order_id = #{orderId,jdbcType=BIGINT}) poi,
         </if>
         (select * from plt_product  where  deleted!=1) p
         <if test="orderId != null and orderId != ''">
@@ -211,7 +214,7 @@
     select max(code) from plt_product
   </select>
     <select id="exists" resultType="java.lang.Boolean">
-        select count(1) from plt_product where name = #{name}
+        select count(1) from plt_product where name = #{name} and type = #{type}
         <if test="id != null">
             and id != #{id}
         </if>

--
Gitblit v1.8.0