Commit 62cef19d authored by 王蔡翾's avatar 王蔡翾
Browse files

oa账户适配以及bug修复

parent 43a24fcb
...@@ -7,9 +7,11 @@ ...@@ -7,9 +7,11 @@
id, id,
project_id, project_id,
project_role, project_role,
assessment_descripton, assessment_description,
assessment_standard, assessment_standard,
parent_id parent_id,
percentage,
level
from bs_project_role_assessment from bs_project_role_assessment
where project_id = #{projectId} where project_id = #{projectId}
and project_role = #{projectRole} and project_role = #{projectRole}
......
...@@ -6,10 +6,9 @@ ...@@ -6,10 +6,9 @@
select select
id, id,
name, name,
parent_id, dept_admin
sort_order
from from
sys_dept dept
</select> </select>
</mapper> </mapper>
...@@ -3,32 +3,42 @@ ...@@ -3,32 +3,42 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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"> <mapper namespace="com.platform.projectBusiness.mapper.SysUserMapper">
<select id="queryUserList" resultType="com.platform.projectBusiness.model.vo.SysUserVO"> <select id="queryUserList" resultType="com.platform.projectBusiness.model.vo.SysUserVO">
select SELECT
su.id as id, u.id,
su.user_name as userName, u.name,
su.nick_name as nickName, DATE_FORMAT(u.create_time, '%Y-%m-%d') as createTime,
su.phone as phone, u.phone,
su.email as email, u.id_card as idCard,
su.password as password, u.fn,
sr.name as roleName, u.work_no as workNo,
sd.name as deptName u.sex,
from u.birth_date as birthDate,
sys_user su u.birth,
left join u.age,
sys_role sr u.nation,
on su.role_id = sr.id u.company_name as companyName,
left join u.post,
sys_dept sd u.post_rank as postRank,
on sd.id = su.dept_id 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> <where>
<if test="userName != null and userName != ''"> <if test="name != null and name != ''">
user_name =#{userName} u.name =#{name}
</if> </if>
<if test="roleId != null and roleId != ''"> <if test="roleId != null and roleId != ''">
and role_id =#{roleId} and u.role_id =#{roleId}
</if> </if>
</where> </where>
</select> </select>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment