Merge remote-tracking branch 'origin/release_v1.0.0' into dev_v1.0.0

sop-business/src/main/java/com/qmth/sop/business/service/impl/SysCustomServiceImpl.java

@@ -1,6 +1,7 @@
 package com.qmth.sop.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -80,6 +81,8 @@ public class SysCustomServiceImpl extends ServiceImpl<SysCustomMapper, SysCustom
                 e.setCustomId(sysCustom.getId());
                 sysCustomAddrService.saveOrUpdate(e);
             });
+            if(Objects.isNull(sysCustom.getLevelId()))
+                return saveOrUpdate(sysCustom,new LambdaUpdateWrapper<SysCustom>().set(SysCustom::getLevelId,null).eq(SysCustom::getId,sysCustom.getId()));
             return saveOrUpdate(sysCustom);
         } catch (Exception e) {
             if (e instanceof DuplicateKeyException) {

sop-business/src/main/java/com/qmth/sop/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -226,8 +226,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     customImportDtoLinkedMultiValueMap.addAll(dataList);
                     errorData.add(errorDataSj.toString());
                 }
-            }).headRowNumber(2).sheet(0).doRead();
-
+            }).ignoreEmptyRow(true).headRowNumber(2).sheet(0).autoTrim(true).doRead();
 
             map.computeIfAbsent(SystemConstant.EXCEL_DATA, v -> customImportDtoLinkedMultiValueMap);
             map.computeIfAbsent(SystemConstant.EXCEL_DATA_ERROR, v -> errorData.toString());
@@ -383,7 +382,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     customImportDtoLinkedMultiValueMap.addAll(dataList);
                     errorData.add(errorDataSj.toString());
                 }
-            }).headRowNumber(2).sheet(0).doRead();
+            }).ignoreEmptyRow(true).headRowNumber(2).sheet(0).autoTrim(true).doRead();
 
 
             map.computeIfAbsent(SystemConstant.EXCEL_DATA, v -> customImportDtoLinkedMultiValueMap);

sop-business/src/main/resources/db/log/shudonghui_update_log.sql

@@ -311,4 +311,12 @@ UPDATE `sys_privilege` SET `name` = '批量导入', `url` = 'BatchImport', `type
 ALTER TABLE `sys_message`
     MODIFY COLUMN `content` varchar(10000) CHARACTER SET utf8mb4 NOT NULL COMMENT '消息内容' AFTER `receive_user_id`;
 ALTER TABLE `sys_notice`
-    MODIFY COLUMN `content` varchar(10000) CHARACTER SET utf8mb4 NOT NULL COMMENT '内容' AFTER `title`;
+    MODIFY COLUMN `content` varchar(10000) CHARACTER SET utf8mb4 NOT NULL COMMENT '内容' AFTER `title`;
+
+---2023.10.9
+INSERT INTO `sys_privilege` ( `id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display` )
+VALUES
+    ( 1052, '修改', 'Update', 'LINK', 5, 1, 'AUTH', '276', 1, 0, 1 );
+INSERT INTO `sys_privilege` ( `id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display` )
+VALUES
+    ( 1053, '禁用启用', 'Enable', 'LINK', 5, 2, 'AUTH', '272,1046', 1, 0, 1 );

sop-business/src/main/resources/mapper/SysCustomMapper.xml

@@ -15,7 +15,7 @@
                 and a.manager_id = #{managerId}
             </if>
             <if test="name != null and name != ''">
-                and a.name = #{name}
+                and a.name like concat('%', #{name} , '%')
             </if>
             <if test="levelId != null and levelId != ''">
                 and a.level_id = #{levelId}

sop-business/src/main/resources/mapper/SysMessageMapper.xml

@@ -6,10 +6,10 @@
         SELECT
         m.receive_time,
         ua.CODE,
-        ua.NAME,
+        u.real_name NAME,
         ua.province,
         ua.city,
-        ua.mobile_number,
+        u.mobile_number,
         s.NAME supplier,
         bs.NAME service,
         c.NAME custom,