diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 4ed13149..cf8ab2f2 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -129,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" email, status, create_by, + type_flag, create_time )values( #{deptId}, @@ -141,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{email}, #{status}, #{createBy}, + #{typeFlag}, sysdate() ) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java index 5983a664..bc3b49e9 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java @@ -179,8 +179,8 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService List deptUserList = new ArrayList<>(); if(Convert.toInt(nowRole)<11){ - deptUserList = surProjectUserinfoMapper.selectProjectDeptUserinfoList(surProjectUserinfo); - projectUserList.addAll(deptUserList); + // deptUserList = surProjectUserinfoMapper.selectProjectDeptUserinfoList(surProjectUserinfo); + // projectUserList.addAll(deptUserList); } for(SurProjectUnitInfo unitInfo:surProjectUnitInfoList){ List userInfoList = new ArrayList<>();