bonus
/
js_image_annotation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
haozq 2025-10-29 09:27:34 +08:00
parent 3558a66ac3
commit 755ad9f8d3
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bonus-admin/src/main/java/com/bonus/web/controller/system/SysDeptController.java
View File

@ -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("存在下级部门,不允许删除");
}

9
bonus-admin/src/main/resources/application-dev.yml
View File

@ -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:

10
bonus-business/src/main/resources/mapper/business/ImageCaptionMapper.xml
View File

@ -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>

3
bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
View File

@ -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()));

4
bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -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')