From dbd3717c73a6e34c8861f006fa78eae82715bd0b Mon Sep 17 00:00:00 2001
From: xbw <v-xiongbowen@vanyol.com>
Date: Thu, 31 Oct 2024 18:09:16 +0800
Subject: [PATCH] 1 bug

---
 .../main/java/jnpf/mapper/TBunchingMapper.java    |  3 ++-
 .../jnpf/mapper/TSystemConfigurationMapper.java   |  3 ++-
 .../java/jnpf/mapper/TUserForLibraryMapper.java   |  3 ++-
 .../jnpf/service/impl/TBunchingServiceImpl.java   |  4 ++--
 .../service/impl/TReceiveConfigServiceImpl.java   | 15 +++++++++++----
 .../jnpf/service/impl/TReceiveServiceImpl.java    |  2 +-
 .../impl/TSystemConfigurationServiceImpl.java     |  2 +-
 .../service/impl/TUserForLibraryServiceImpl.java  |  4 ++--
 .../src/main/resources/mapper/TBunchingMapper.xml |  4 ++--
 .../resources/mapper/TSystemConfiguration.xml     |  4 ++--
 .../resources/mapper/TUserForLibraryMapper.xml    |  8 ++++----
 .../src/main/java/jnpf/entity/TBunching.java      |  1 -
 .../java/jnpf/entity/TSystemConfiguration.java    |  1 -
 .../main/java/jnpf/entity/TUserForLibrary.java    |  1 -
 14 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TBunchingMapper.java b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TBunchingMapper.java
index ce65486..67c034f 100644
--- a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TBunchingMapper.java
+++ b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TBunchingMapper.java
@@ -4,12 +4,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jnpf.entity.TBunching;
 import jnpf.model.dto.TBunchingDto;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
  * @author xbw
  */
 public interface TBunchingMapper extends BaseMapper<TBunching> {
-    IPage<TBunching> selectList(IPage<TBunching> page, TBunchingDto.TBunchingDtoParam param);
+    IPage<TBunching> selectList(IPage<TBunching> page, @Param("param") TBunchingDto.TBunchingDtoParam param);
 }
 
diff --git a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TSystemConfigurationMapper.java b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TSystemConfigurationMapper.java
index a880aa5..0748eac 100644
--- a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TSystemConfigurationMapper.java
+++ b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TSystemConfigurationMapper.java
@@ -6,12 +6,13 @@ import jnpf.entity.TSystemConfiguration;
 import jnpf.entity.TUserForLibrary;
 import jnpf.model.dto.TSystemConfigurationDto;
 import jnpf.model.dto.TUserForLibraryDto;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
  * @author xbw
  */
 public interface TSystemConfigurationMapper extends BaseMapper<TSystemConfiguration> {
-    IPage<TSystemConfiguration> selectList(IPage<TSystemConfiguration> page, TSystemConfigurationDto.TSystemConfigurationDtoParam param);
+    IPage<TSystemConfiguration> selectList(IPage<TSystemConfiguration> page,@Param("param") TSystemConfigurationDto.TSystemConfigurationDtoParam param);
 }
 
diff --git a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TUserForLibraryMapper.java b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TUserForLibraryMapper.java
index edf21eb..1fac25b 100644
--- a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TUserForLibraryMapper.java
+++ b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TUserForLibraryMapper.java
@@ -4,12 +4,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jnpf.entity.TUserForLibrary;
 import jnpf.model.dto.TUserForLibraryDto;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
  * @author xbw
  */
 public interface TUserForLibraryMapper extends BaseMapper<TUserForLibrary> {
-    IPage<TUserForLibrary> selectList(IPage<TUserForLibrary> page, TUserForLibraryDto.TUserForLibraryDtoParam param);
+    IPage<TUserForLibrary> selectList(IPage<TUserForLibrary> page, @Param("param") TUserForLibraryDto.TUserForLibraryDtoParam param);
 }
 
diff --git a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TBunchingServiceImpl.java b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TBunchingServiceImpl.java
index 95af138..2c906d0 100644
--- a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TBunchingServiceImpl.java
+++ b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TBunchingServiceImpl.java
@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
  * @author xbw
  */
 @Service("iTBunchingService")
-@DS("bunching")
+@DS("library")
 public class TBunchingServiceImpl extends ServiceImpl<TBunchingMapper, TBunching> implements TBunchingService {
 
 
@@ -44,7 +44,7 @@ public class TBunchingServiceImpl extends ServiceImpl<TBunchingMapper, TBunching
         }
 
         tBunching.setUpdateTime(LocalDateTime.now());
-        tBunching.setUpdateBy(UserProvider.getUser().getUserName());
+        tBunching.setUpdateBy(UserProvider.getUser().getUserId());
         tBunching.setUpdateName(UserProvider.getUser().getUserId());
         this.updateById(tBunching);
 
diff --git a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TReceiveConfigServiceImpl.java b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TReceiveConfigServiceImpl.java
index 4c4a9aa..96bc68c 100644
--- a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TReceiveConfigServiceImpl.java
+++ b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TReceiveConfigServiceImpl.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
  * @author xbw
  */
 @Service("iTReceiveServiceConfig")
-@DS("receiveConfig")
+@DS("library")
 public class TReceiveConfigServiceImpl extends ServiceImpl<TReceiveConfigMapper, TReceiveConfig> implements TReceiveConfigService {
 
     @Resource
@@ -109,14 +109,21 @@ public class TReceiveConfigServiceImpl extends ServiceImpl<TReceiveConfigMapper,
         // 更新配置
         tReceiveConfig.setUpdateTime(LocalDateTime.now());
         tReceiveConfig.setUpdateName(user.getUserName());
-        tReceiveConfig.setUpdateBy(user.getId());
-        this.updateById(tReceiveConfig);
+        tReceiveConfig.setUpdateBy(user.getUserId());
+        if(tReceiveConfig.getId()==null){
+            tReceiveConfig.setCreateBy(user.getUserId());
+            tReceiveConfig.setCreateName(user.getUserId());
+            tReceiveConfig.setCreateTime(LocalDateTime.now());
+            this.save(tReceiveConfig);
+        }else {
+            this.updateById(tReceiveConfig);
+        }
 
         LocalDateTime now = LocalDateTime.now();
 
         tReceives.forEach(item -> {
             item.setCreateTime(now);
-            item.setCreateBy(user.getId());
+            item.setCreateBy(user.getUserId());
             item.setCreateName(user.getUserName());
         });
         // 添加修改记录
diff --git a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TReceiveServiceImpl.java b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TReceiveServiceImpl.java
index 4eff318..fbeabd8 100644
--- a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TReceiveServiceImpl.java
+++ b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TReceiveServiceImpl.java
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service;
  * @author xbw
  */
 @Service("iTReceiveService")
-@DS("receive")
+@DS("library")
 public class TReceiveServiceImpl extends ServiceImpl<TReceiveMapper, TReceive> implements TReceiveService {
 
 
diff --git a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TSystemConfigurationServiceImpl.java b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TSystemConfigurationServiceImpl.java
index ebbbccc..b1d95fd 100644
--- a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TSystemConfigurationServiceImpl.java
+++ b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TSystemConfigurationServiceImpl.java
@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
  * @author xbw
  */
 @Service("iTSystemConfigurationService")
-@DS("systemConfiguration")
+@DS("library")
 public class TSystemConfigurationServiceImpl extends ServiceImpl<TSystemConfigurationMapper, TSystemConfiguration> implements TSystemConfigurationService {
 
 
diff --git a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TUserForLibraryServiceImpl.java b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TUserForLibraryServiceImpl.java
index a90817e..7afcdb8 100644
--- a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TUserForLibraryServiceImpl.java
+++ b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TUserForLibraryServiceImpl.java
@@ -23,7 +23,7 @@ import java.time.LocalDateTime;
  * @author xbw
  */
 @Service("iUserForLibraryService")
-@DS("userForLibrary")
+@DS("library")
 public class TUserForLibraryServiceImpl extends ServiceImpl<TUserForLibraryMapper, TUserForLibrary> implements TUserForLibraryService {
 
 
@@ -32,7 +32,7 @@ public class TUserForLibraryServiceImpl extends ServiceImpl<TUserForLibraryMappe
         if (StringUtils.isBlank(tUserForLibraryDtoAdd.getUserName())) {
             throw new DataException("用户姓名不正确");
         }
-        if (StringUtils.isBlank(tUserForLibraryDtoAdd.getUserPhone()) || PhoneUtil.isMobile(tUserForLibraryDtoAdd.getUserPhone())) {
+        if (StringUtils.isBlank(tUserForLibraryDtoAdd.getUserPhone()) || !PhoneUtil.isMobile(tUserForLibraryDtoAdd.getUserPhone())) {
             throw new DataException("用户号码不正确");
         }
         if (tUserForLibraryDtoAdd.getSex() == null) {
diff --git a/jnpf-library/jnpf-library-biz/src/main/resources/mapper/TBunchingMapper.xml b/jnpf-library/jnpf-library-biz/src/main/resources/mapper/TBunchingMapper.xml
index 29dda5c..97b4c03 100644
--- a/jnpf-library/jnpf-library-biz/src/main/resources/mapper/TBunchingMapper.xml
+++ b/jnpf-library/jnpf-library-biz/src/main/resources/mapper/TBunchingMapper.xml
@@ -28,8 +28,8 @@
         <include refid="Base_Column_List"/>
         from t_bunching
         <where>
-            <if test="bunchingTo!='' and bunchingTo != null">
-                and bunching_to like concat('%',#{bunchingTo},'%')
+            <if test="param.bunchingTo!='' and param.bunchingTo != null">
+                and bunching_to like concat('%',#{param.bunchingTo},'%')
             </if>
         and del_flag = 0
         </where>
diff --git a/jnpf-library/jnpf-library-biz/src/main/resources/mapper/TSystemConfiguration.xml b/jnpf-library/jnpf-library-biz/src/main/resources/mapper/TSystemConfiguration.xml
index 77b6ed9..d62cedb 100644
--- a/jnpf-library/jnpf-library-biz/src/main/resources/mapper/TSystemConfiguration.xml
+++ b/jnpf-library/jnpf-library-biz/src/main/resources/mapper/TSystemConfiguration.xml
@@ -28,8 +28,8 @@
         <include refid="Base_Column_List"/>
         from t_system_configuration
         <where>
-            <if test="systemParameter!='' and systemParameter != null">
-                and system_parameter like concat('%',#{systemParameter},'%')
+            <if test="param.systemParameter!='' and param.systemParameter != null">
+                and system_parameter like concat('%',#{param.systemParameter},'%')
             </if>
         and del_flag = 0
         </where>
diff --git a/jnpf-library/jnpf-library-biz/src/main/resources/mapper/TUserForLibraryMapper.xml b/jnpf-library/jnpf-library-biz/src/main/resources/mapper/TUserForLibraryMapper.xml
index 15a856e..1306496 100644
--- a/jnpf-library/jnpf-library-biz/src/main/resources/mapper/TUserForLibraryMapper.xml
+++ b/jnpf-library/jnpf-library-biz/src/main/resources/mapper/TUserForLibraryMapper.xml
@@ -31,11 +31,11 @@
         <include refid="Base_Column_List"/>
         from t_user_for_library
         <where>
-            <if test="userPhone!='' and userPhone != null">
-                and user_phone like concat('%',#{userPhone},'%')
+            <if test="param.userPhone!='' and param.userPhone != null">
+                and user_phone like concat('%',#{param.userPhone},'%')
             </if>
-            <if test="userName!='' and userName != null">
-                and user_name like concat('%',#{userName},'%')
+            <if test="param.userName!='' and param.userName != null">
+                and user_name like concat('%',#{param.userName},'%')
             </if>
         and del_flag = 0
         </where>
diff --git a/jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TBunching.java b/jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TBunching.java
index d156401..1309a0e 100644
--- a/jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TBunching.java
+++ b/jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TBunching.java
@@ -35,7 +35,6 @@ public class TBunching implements Serializable {
 
     @ApiModelProperty(value = "删除标记0-正常 1-删除")
     @TableField(value = "del_flag")
-    @TableLogic
     private Integer delFlag;
 
     @ApiModelProperty(value = "创建者id")
diff --git a/jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TSystemConfiguration.java b/jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TSystemConfiguration.java
index 8905083..68eec8c 100644
--- a/jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TSystemConfiguration.java
+++ b/jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TSystemConfiguration.java
@@ -35,7 +35,6 @@ public class TSystemConfiguration implements Serializable {
 
     @ApiModelProperty(value = "删除标记0-正常 1-删除")
     @TableField(value = "del_flag")
-    @TableLogic
     private Integer delFlag;
 
     @ApiModelProperty(value = "创建者id")
diff --git a/jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TUserForLibrary.java b/jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TUserForLibrary.java
index 81717f4..c0cb6ef 100644
--- a/jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TUserForLibrary.java
+++ b/jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TUserForLibrary.java
@@ -56,7 +56,6 @@ public class TUserForLibrary implements Serializable {
 
     @ApiModelProperty(value = "删除标记0-正常 1-删除")
     @TableField(value = "del_flag")
-    @TableLogic
     private Integer delFlag;
 
     @ApiModelProperty(value = "创建者id")