Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
王蔡翾
project_assessment
Commits
62cef19d
Commit
62cef19d
authored
Dec 16, 2025
by
王蔡翾
Browse files
oa账户适配以及bug修复
parent
43a24fcb
Changes
23
Hide whitespace changes
Inline
Side-by-side
project-business/src/main/resources/mapper/BsProjectRoleAssessmentMapper.xml
View file @
62cef19d
...
...
@@ -7,9 +7,11 @@
id,
project_id,
project_role,
assessment_descripton,
assessment_descript
i
on,
assessment_standard,
parent_id
parent_id,
percentage,
level
from bs_project_role_assessment
where project_id = #{projectId}
and project_role = #{projectRole}
...
...
project-business/src/main/resources/mapper/SysDeptMapper.xml
View file @
62cef19d
...
...
@@ -6,10 +6,9 @@
select
id,
name,
parent_id,
sort_order
dept_admin
from
sys_
dept
dept
</select>
</mapper>
project-business/src/main/resources/mapper/SysUserMapper.xml
View file @
62cef19d
...
...
@@ -3,32 +3,42 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.platform.projectBusiness.mapper.SysUserMapper"
>
<select
id=
"queryUserList"
resultType=
"com.platform.projectBusiness.model.vo.SysUserVO"
>
select
su.id as id,
su.user_name as userName,
su.nick_name as nickName,
su.phone as phone,
su.email as email,
su.password as password,
sr.name as roleName,
sd.name as deptName
from
sys_user su
left join
sys_role sr
on su.role_id = sr.id
left join
sys_dept sd
on sd.id = su.dept_id
SELECT
u.id,
u.name,
DATE_FORMAT(u.create_time, '%Y-%m-%d') as createTime,
u.phone,
u.id_card as idCard,
u.fn,
u.work_no as workNo,
u.sex,
u.birth_date as birthDate,
u.birth,
u.age,
u.nation,
u.company_name as companyName,
u.post,
u.post_rank as postRank,
u.sequence,
DATE_FORMAT(u.join_date, '%Y-%m-%d') as joinDate,
u.second_dept as secondDept,
u.third_dept as thirdDept,
u.password,
u.email,
u.user_role as userRole,
d.name as deptName,
r.name as roleName
FROM `user` u
LEFT JOIN dept d ON u.dept_id = d.id
LEFT JOIN sys_role r ON u.role_id = r.id
<where>
<if
test=
"
userN
ame != null and
userN
ame != ''"
>
user_
name =#{
userN
ame}
<if
test=
"
n
ame != null and
n
ame != ''"
>
u.
name =#{
n
ame}
</if>
<if
test=
"roleId != null and roleId != ''"
>
and role_id =#{roleId}
and
u.
role_id =#{roleId}
</if>
</where>
</select>
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment