add:统计打包企业等字段调整

This commit is contained in:
zhangqinlin
2021-12-07 11:25:00 +08:00
parent f2856bd306
commit 753e4b4b28
@@ -10,6 +10,7 @@ import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.system.vo.SysDepartModel;
import com.jero.common.system.vo.SysDepartTreeModel;
import com.jero.common.util.oConvertUtils;
import com.jero.mail.commont.constant;
@@ -366,14 +367,15 @@ public class AllProjectStatisticsController {
}
@ApiOperation(value = "查询列表", notes = "查询列表")
@ApiOperation(value = "通过部门id查所有人员", notes = "通过部门id查所有人员")
@RequestMapping(value = "/listForUserByOrgCode", method = RequestMethod.GET)
public Result<?> listForUserByOrgCode(@RequestParam(name = "departId",required = true) String departId) {
List<SysDepartTreeModel> sysDepartTreeModels =sysBaseAPI.listSonDepartsByDepId(departId);
SysDepartModel sysDepartModel = sysBaseAPI.selectAllById(departId);
List<String> orgCodes = sysDepartTreeModels.stream().map(s -> s.getOrgCode()).collect(Collectors.toList());
orgCodes.add(sysDepartModel.getOrgCode());
QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
queryWrapper.in("org_code",orgCodes);
queryWrapper.ne("username","_reserve_user_external");
List<SysUser> pageList = sysUserService.list(queryWrapper);
return Result.OK(pageList);
}