From 755ad9f8d3fdde83475b6f043665559f20aa0e57 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Wed, 29 Oct 2025 09:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/web/controller/system/SysDeptController.java | 10 ++--------
 bonus-admin/src/main/resources/application-dev.yml     |  9 ++++++---
 .../resources/mapper/business/ImageCaptionMapper.xml   | 10 +++++-----
 .../bonus/system/service/impl/SysUserServiceImpl.java  |  3 +++
 .../src/main/resources/mapper/system/SysUserMapper.xml |  4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/system/SysDeptController.java b/bonus-admin/src/main/java/com/bonus/web/controller/system/SysDeptController.java
index a60d5a0..722d6fc 100644
--- a/bonus-admin/src/main/java/com/bonus/web/controller/system/SysDeptController.java
+++ b/bonus-admin/src/main/java/com/bonus/web/controller/system/SysDeptController.java
@@ -121,18 +121,12 @@ public class SysDeptController extends BaseController {
     @DeleteMapping("/{deptId}")
     public AjaxResult remove(@PathVariable Long deptId) {
         // 如果该部门已被使用，则无法删除
-        Integer num = deptService.getTransferApplyDeptId(deptId);
-        if (num > 0) {
-            return error("该部门或其子部门已被档案申请使用，请勿删除");
-        }
+
         Integer num1 = deptService.getSysUserDeptId(deptId);
         if (num1 > 0) {
             return error("该部门或其子部门已被用户管理使用，请勿删除");
         }
-        Integer num2 = deptService.getTransferIssueDeptId(deptId);
-        if (num2 > 0) {
-            return error("该部门或其子部门已被档案移交问题管理，请勿删除");
-        }
+
         if (deptService.hasChildByDeptId(deptId)) {
             return warn("存在下级部门,不允许删除");
         }
diff --git a/bonus-admin/src/main/resources/application-dev.yml b/bonus-admin/src/main/resources/application-dev.yml
index c4c0086..fae1068 100644
--- a/bonus-admin/src/main/resources/application-dev.yml
+++ b/bonus-admin/src/main/resources/application-dev.yml
@@ -49,7 +49,10 @@ user:
     # 密码锁定时间（默认10分钟）
     lockTime: 10
 
-# Spring配置
+# Spri# 单个文件的最大大小（-1 表示无限制）
+#spring.servlet.multipart.max-file-size=-1
+## 整个请求（多文件上传时所有文件总和）的最大大小（-1 表示无限制）
+#spring.servlet.multipart.max-request-size=-1ng配置
 spring:
   # 资源信息
   messages:
@@ -59,9 +62,9 @@ spring:
   servlet:
     multipart:
       # 单个文件大小
-      max-file-size: 10MB
+      max-file-size: -1
       # 设置总上传的文件大小
-      max-request-size: 20MB
+      max-request-size: -1
   # 服务模块
   devtools:
     restart:
diff --git a/bonus-business/src/main/resources/mapper/business/ImageCaptionMapper.xml b/bonus-business/src/main/resources/mapper/business/ImageCaptionMapper.xml
index 1cbae18..b113273 100644
--- a/bonus-business/src/main/resources/mapper/business/ImageCaptionMapper.xml
+++ b/bonus-business/src/main/resources/mapper/business/ImageCaptionMapper.xml
@@ -184,7 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             file.bj_file_path bjFilePath, file.file_size fileSize,
             tir.content_image contentImage,ROUND(tir.overall_score, 2) overallScore,tir.clarity,
             tir.cleanliness,tir.compress_marks compressMarks,tir.impression,
-            tir.balance,tir.detail,tir.type,su.user_name userName
+            tir.balance,tir.detail,tir.type,su.user_name userName,file.create_time  createTime
             from  tb_algorithm tam
             left join tb_user_oper tuo on tuo.id=tam.oper_id
             left join tb_sure_file file on file.algorithm_id=tam.id
@@ -196,11 +196,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and  tam.user_id=#{createUser}
             </if>
             <if test="operaTime!=null and operaTime!=''">
-                    and  DATE(tam.create_time) =#{operaTime}
+                and  DATE(tam.create_time) =#{operaTime}
+            </if>
+            <if test="userName!=null and userName!=''">
+                and  su.user_name   like concat('%',#{userName},'%')
             </if>
-                <if test="userName!=null and userName!=''">
-                    and  su.user_name   like concat('%',#{userName},'%')
-                </if>
             <if test="operaName!=null and operaName!=''">
                 and   tir.content_image like concat('%',#{operaName},'%')
             </if>
diff --git a/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java b/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
index 94525fb..d04af3b 100644
--- a/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
+++ b/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
@@ -77,6 +77,9 @@ public class SysUserServiceImpl implements ISysUserService {
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserList(SysUser user) {
+        if(StringUtils.isNotEmpty(user.getPhonenumber())){
+            user.setPhonenumber(Sm4Utils.encrypt(user.getPhonenumber()));
+        }
         List<SysUser> sysUsers = userMapper.selectUserList(user);
         for (SysUser sysUser : sysUsers) {
             sysUser.setPhonenumber(Sm4Utils.decrypt(sysUser.getPhonenumber()));
diff --git a/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
index f0b88d0..6455685 100644
--- a/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
+		select distinct u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
 		       u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name,
 		       d.leader ,dksr.role_id,dksr.role_name
 		from da_ky_sys_user u
@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND dksr.role_id = #{roleId}
 		</if>
 		<if test="phonenumber != null and phonenumber != ''">
-			AND INSTR(u.phonenumber, #{phonenumber}) > 0
+			AND u.phonenumber=#{phonenumber}
 		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 			AND date_format(u.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')