sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2023-11-21 00:05:31 +08:00
parent 8139308f82
commit dbb809777c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -129,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="email != null and email != ''">email,</if> <if test="email != null and email != ''">email,</if>
<if test="status != null">status,</if> <if test="status != null">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if> <if test="createBy != null and createBy != ''">create_by,</if>
<if test="typeFlag != null and typeFlag != ''">type_flag,</if>
create_time create_time
)values( )values(
<if test="deptId != null and deptId != 0">#{deptId},</if> <if test="deptId != null and deptId != 0">#{deptId},</if>
@ -141,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="email != null and email != ''">#{email},</if> <if test="email != null and email != ''">#{email},</if>
<if test="status != null">#{status},</if> <if test="status != null">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="typeFlag != null and typeFlag != ''">#{typeFlag},</if>
sysdate() sysdate()
) )
</insert> </insert>

4
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java
View File

@ -179,8 +179,8 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService
List<SurProjectUserinfo> deptUserList = new ArrayList<>(); List<SurProjectUserinfo> deptUserList = new ArrayList<>();
if(Convert.toInt(nowRole)<11){ if(Convert.toInt(nowRole)<11){
deptUserList = surProjectUserinfoMapper.selectProjectDeptUserinfoList(surProjectUserinfo); // deptUserList = surProjectUserinfoMapper.selectProjectDeptUserinfoList(surProjectUserinfo);
projectUserList.addAll(deptUserList); // projectUserList.addAll(deptUserList);
} }
for(SurProjectUnitInfo unitInfo:surProjectUnitInfoList){ for(SurProjectUnitInfo unitInfo:surProjectUnitInfoList){
List<SurProjectUserinfo> userInfoList = new ArrayList<>(); List<SurProjectUserinfo> userInfoList = new ArrayList<>();