lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zt
2025-09-25 20:37:50 +08:00
parent 570e7dd019
commit 259ddd46cf
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
View File

@ -2,6 +2,7 @@ package org.dromara.project.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -175,7 +176,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
.set(SubConstructionUser::getEntryDate, new Date()) .set(SubConstructionUser::getEntryDate, new Date())
.set(SubConstructionUser::getLeaveDate, null) .set(SubConstructionUser::getLeaveDate, null)
.set(SubConstructionUser::getExitStatus, "0") .set(SubConstructionUser::getExitStatus, "0")
.set(SubConstructionUser::getTypeOfWork,req.getTypeOfWork()) .set(StrUtil.isNotBlank(req.getTypeOfWork()),SubConstructionUser::getTypeOfWork,req.getTypeOfWork())
.set(constructionUser.getFirstDate() == null, SubConstructionUser::getFirstDate, LocalDate.now()); .set(constructionUser.getFirstDate() == null, SubConstructionUser::getFirstDate, LocalDate.now());
constructionUserService.update(constructionUserLuw); constructionUserService.update(constructionUserLuw);

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/SysUserAppController.java
View File

@ -78,8 +78,8 @@ public class SysUserAppController extends BaseController {
@SaIgnore @SaIgnore
@GetMapping("/deptTree") @GetMapping("/deptTree")
public R<List<Tree<Long>>> deptTree(SysDeptBo dept) { public R<List<Tree<Long>>> deptTree(SysDeptBo dept) {
dept.setDeptTypes(Arrays.asList(SysDeptTypeEnum.PROJECT.getCode(), SysDeptTypeEnum.COMPANY.getCode() // dept.setDeptTypes(Arrays.asList(SysDeptTypeEnum.PROJECT.getCode(), SysDeptTypeEnum.COMPANY.getCode()
, SysDeptTypeEnum.CONTRACT.getCode())); // , SysDeptTypeEnum.CONTRACT.getCode()));
return R.ok(deptService.selectDeptTreeList(dept)); return R.ok(deptService.selectDeptTreeList(dept));
} }