修复mapper.xml中的遗漏问题

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/CustomProductInfoServiceImpl.java

@@ -1649,11 +1649,15 @@ public class CustomProductInfoServiceImpl implements CustomProductInfoService {
         // 工厂关联 ID 列表
         // 工厂关联 ID 列表
         fullVO.setFactoryIds(factoryIds);
         fullVO.setFactoryIds(factoryIds);
 
 
-        // 备注
-        fullVO.setProductCnRemark(BeanMapper.snakeCase().convert(cnRemark, ProductRemarkVO.class));
-        fullVO.setProductRemark(BeanMapper.snakeCase().convert(remark, ProductRemarkVO.class));
-        fullVO.setRemark(remark.getRemark());
-        fullVO.setCnRemark(cnRemark.getRemark());
+        // 备注（null-safe：商品可能无中/英文备注）
+        if (cnRemark != null) {
+            fullVO.setProductCnRemark(BeanMapper.snakeCase().convert(cnRemark, ProductRemarkVO.class));
+            fullVO.setCnRemark(cnRemark.getRemark());
+        }
+        if (remark != null) {
+            fullVO.setProductRemark(BeanMapper.snakeCase().convert(remark, ProductRemarkVO.class));
+            fullVO.setRemark(remark.getRemark());
+        }
 
 
         return fullVO;
         return fullVO;
     }
     }

custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductInfoSnakeVO.java

@@ -59,8 +59,7 @@ public class CustomProductInfoSnakeVO implements Serializable {
     private Integer category_id;
     private Integer category_id;
 
 
     @Schema(description = "重量(kg)")
     @Schema(description = "重量(kg)")
-    //private BigDecimal weight;
-    private String weight;
+    private BigDecimal weight;
 
 
     @Schema(description = "最小采购量")
     @Schema(description = "最小采购量")
     private Integer purchasing_min;
     private Integer purchasing_min;

custom-server-domain/src/main/java/com/jomalls/custom/dal/mapper/SysMenuMapper.java

@@ -3,6 +3,7 @@ package com.jomalls.custom.dal.mapper;
 import com.jomalls.custom.dal.entity.SysMenuEntity;
 import com.jomalls.custom.dal.entity.SysMenuEntity;
 import com.jomalls.custom.mapper.BaseMapper;
 import com.jomalls.custom.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -14,5 +15,5 @@ import java.util.List;
  */
  */
 @Mapper
 @Mapper
 public interface SysMenuMapper extends BaseMapper<SysMenuEntity> {
 public interface SysMenuMapper extends BaseMapper<SysMenuEntity> {
-    List<String> selectMenuPermsByUserId(Long userId);
+    List<String> selectMenuPermsByUserId(@Param("userId") Long userId);
 }
 }

custom-server-domain/src/main/java/com/jomalls/custom/dal/mapper/SysRoleMapper.java

@@ -3,6 +3,7 @@ package com.jomalls.custom.dal.mapper;
 import com.jomalls.custom.dal.entity.SysRoleEntity;
 import com.jomalls.custom.dal.entity.SysRoleEntity;
 import com.jomalls.custom.mapper.BaseMapper;
 import com.jomalls.custom.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -14,5 +15,5 @@ import java.util.List;
  */
  */
 @Mapper
 @Mapper
 public interface SysRoleMapper extends BaseMapper<SysRoleEntity> {
 public interface SysRoleMapper extends BaseMapper<SysRoleEntity> {
-    List<String> selectRoleKeysByUserId(Long userId);
+    List<String> selectRoleKeysByUserId(@Param("userId") Long userId);
 }
 }

custom-server-domain/src/main/resources/mapper/LogProductTemplateMapper.xml

@@ -14,4 +14,12 @@
     <sql id="tableColumns">
     <sql id="tableColumns">
         id, template_id, employee_id, employee_account, description, create_time
         id, template_id, employee_id, employee_account, description, create_time
     </sql>
     </sql>
+
+    <!-- 批量插入 -->
+    <insert id="insertBatchSomeColumn">
+        INSERT INTO log_product_template (template_id, employee_id, employee_account, description, create_time) VALUES
+        <foreach collection="list" item="item" separator=",">
+            (#{item.templateId}, #{item.employeeId}, #{item.employeeAccount}, #{item.description}, #{item.createTime})
+        </foreach>
+    </insert>
 </mapper>
 </mapper>

custom-server-domain/src/main/resources/mapper/SysMenuMapper.xml

@@ -47,7 +47,7 @@
                    create_time,
                    create_time,
                    update_by,
                    update_by,
                    update_time,
                    update_time,
-                   remark,
+                   remark
             </sql>
             </sql>
 
 
     <!-- 根据用户ID查询权限列表 -->
     <!-- 根据用户ID查询权限列表 -->

custom-server-domain/src/main/resources/mapper/SysRoleDeptMapper.xml

@@ -11,7 +11,7 @@
     <!-- 注意去掉最后一行的逗号 -->
     <!-- 注意去掉最后一行的逗号 -->
     <sql id="tableColumns">
     <sql id="tableColumns">
                    role_id,
                    role_id,
-                   dept_id,
+                   dept_id
             </sql>
             </sql>
 
 
     <!-- 批量插入 -->
     <!-- 批量插入 -->

custom-server-domain/src/main/resources/mapper/SysRoleMapper.xml

@@ -35,7 +35,7 @@
                    create_time,
                    create_time,
                    update_by,
                    update_by,
                    update_time,
                    update_time,
-                   remark,
+                   remark
             </sql>
             </sql>
 
 
     <!-- 根据用户ID查询角色标识列表 -->
     <!-- 根据用户ID查询角色标识列表 -->

custom-server-domain/src/main/resources/mapper/SysRoleMenuMapper.xml

@@ -11,7 +11,7 @@
     <!-- 注意去掉最后一行的逗号 -->
     <!-- 注意去掉最后一行的逗号 -->
     <sql id="tableColumns">
     <sql id="tableColumns">
                    role_id,
                    role_id,
-                   menu_id,
+                   menu_id
             </sql>
             </sql>
 
 
     <!-- 批量插入 -->
     <!-- 批量插入 -->

custom-server-domain/src/main/resources/mapper/SysUserOldMapper.xml

@@ -21,7 +21,7 @@
                    password,
                    password,
                    status,
                    status,
                    remark,
                    remark,
-                   create_time,
+                   create_time
             </sql>
             </sql>
 
 
     <!-- 批量插入 -->
     <!-- 批量插入 -->

custom-server-domain/src/main/resources/mapper/SysUserRoleMapper.xml

@@ -11,7 +11,7 @@
     <!-- 注意去掉最后一行的逗号 -->
     <!-- 注意去掉最后一行的逗号 -->
     <sql id="tableColumns">
     <sql id="tableColumns">
                    user_id,
                    user_id,
-                   role_id,
+                   role_id
             </sql>
             </sql>
 
 
     <!-- 批量插入 -->
     <!-- 批量插入 -->