|
@@ -158,14 +158,14 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
List<SysUser> sysUserList = null;
|
|
List<SysUser> sysUserList = null;
|
|
|
if (sysDept.getComlevel().equals("5")) {
|
|
if (sysDept.getComlevel().equals("5")) {
|
|
|
sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
|
|
sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
|
|
|
- .eq(SysUser::getStatus, 1)
|
|
|
|
|
|
|
+ .ne(SysUser::getStatus, 0)
|
|
|
.likeRight(SysUser::getId, sysDept.getParentId())
|
|
.likeRight(SysUser::getId, sysDept.getParentId())
|
|
|
.notLike(SysUser::getId, "M")
|
|
.notLike(SysUser::getId, "M")
|
|
|
.orderByDesc(SysUser::getCreateTime));
|
|
.orderByDesc(SysUser::getCreateTime));
|
|
|
|
|
|
|
|
} else {
|
|
} else {
|
|
|
sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
|
|
sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
|
|
|
- .eq(SysUser::getStatus, 1)
|
|
|
|
|
|
|
+ .ne(SysUser::getStatus, 0)
|
|
|
.likeRight(SysUser::getId, id)
|
|
.likeRight(SysUser::getId, id)
|
|
|
.notLike(SysUser::getId, "M")
|
|
.notLike(SysUser::getId, "M")
|
|
|
.orderByDesc(SysUser::getCreateTime));
|
|
.orderByDesc(SysUser::getCreateTime));
|
|
@@ -412,7 +412,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
agencyExtractFee.setUserName(sysPartner.getUserName());
|
|
agencyExtractFee.setUserName(sysPartner.getUserName());
|
|
|
SysUser sysUser = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>()
|
|
SysUser sysUser = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>()
|
|
|
.eq(SysUser::getId, sysPartner.getUserId())
|
|
.eq(SysUser::getId, sysPartner.getUserId())
|
|
|
- .eq(SysUser::getStatus, 1));
|
|
|
|
|
|
|
+ .ne(SysUser::getStatus, 0));
|
|
|
agencyExtractFee.setDeptId(sysUser.getDeptId());
|
|
agencyExtractFee.setDeptId(sysUser.getDeptId());
|
|
|
SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
|
|
SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
|
|
|
.eq(SysDept::getId, sysUser.getDeptId()).eq(SysDept::getDelFlag, 0));
|
|
.eq(SysDept::getId, sysUser.getDeptId()).eq(SysDept::getDelFlag, 0));
|
|
@@ -514,7 +514,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
agencyExtractFee.setUserName(sysAgencyLeaders.getUserName());
|
|
agencyExtractFee.setUserName(sysAgencyLeaders.getUserName());
|
|
|
SysUser sysUser = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>()
|
|
SysUser sysUser = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>()
|
|
|
.eq(SysUser::getId, sysAgencyLeaders.getUserId())
|
|
.eq(SysUser::getId, sysAgencyLeaders.getUserId())
|
|
|
- .eq(SysUser::getStatus, 1));
|
|
|
|
|
|
|
+ .ne(SysUser::getStatus, 0));
|
|
|
agencyExtractFee.setDeptId(sysUser.getDeptId());
|
|
agencyExtractFee.setDeptId(sysUser.getDeptId());
|
|
|
SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
|
|
SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
|
|
|
.eq(SysDept::getId, sysUser.getDeptId()).eq(SysDept::getDelFlag, 0));
|
|
.eq(SysDept::getId, sysUser.getDeptId()).eq(SysDept::getDelFlag, 0));
|
|
@@ -797,7 +797,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
teamInformation.setDeptId(sysDept.getId());
|
|
teamInformation.setDeptId(sysDept.getId());
|
|
|
teamInformation.setDeptName(sysDept.getName());
|
|
teamInformation.setDeptName(sysDept.getName());
|
|
|
List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
|
|
List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
|
|
|
- .likeRight(SysUser::getId, sysDept.getId()).eq(SysUser::getStatus, 1));
|
|
|
|
|
|
|
+ .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
|
|
|
teamInformation.setDeptManNum(sysUsers.size());
|
|
teamInformation.setDeptManNum(sysUsers.size());
|
|
|
List<InsOrders> insOrderList;
|
|
List<InsOrders> insOrderList;
|
|
|
//筛选订单,选择时间
|
|
//筛选订单,选择时间
|
|
@@ -920,7 +920,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
for (SysDept sysDept : sysDeptList) {
|
|
for (SysDept sysDept : sysDeptList) {
|
|
|
|
|
|
|
|
List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
|
|
List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
|
|
|
- .likeRight(SysUser::getId, sysDept.getId()).eq(SysUser::getStatus, 1));
|
|
|
|
|
|
|
+ .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
|
|
|
deptManNum = deptManNum + sysUsers.size();
|
|
deptManNum = deptManNum + sysUsers.size();
|
|
|
|
|
|
|
|
Date updateTime = sysAgencyLeader.getUpdateTime();
|
|
Date updateTime = sysAgencyLeader.getUpdateTime();
|
|
@@ -1096,7 +1096,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
public List<SysUser> queryAgencyUser(String deptId) {
|
|
public List<SysUser> queryAgencyUser(String deptId) {
|
|
|
|
|
|
|
|
return sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
|
|
return sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
|
|
|
- .eq(SysUser::getStatus, 1)
|
|
|
|
|
|
|
+ .ne(SysUser::getStatus, 0)
|
|
|
.likeRight(StringUtils.isNotEmpty(deptId), SysUser::getId, deptId));
|
|
.likeRight(StringUtils.isNotEmpty(deptId), SysUser::getId, deptId));
|
|
|
}
|
|
}
|
|
|
|
|
|