diff --git a/src/main/java/com/qs/serve/controller/AdminPortalController.java b/src/main/java/com/qs/serve/controller/AdminPortalController.java index e78cbfcf..b4314b21 100644 --- a/src/main/java/com/qs/serve/controller/AdminPortalController.java +++ b/src/main/java/com/qs/serve/controller/AdminPortalController.java @@ -64,9 +64,7 @@ public class AdminPortalController { private RedisService redisService; private SysUserService sysUserService; private ProjectProperties projectProperties; - private SeeYonRequestService seeYonRequestService; - private TbsCostApplyService costApplyService; private VtbVerificationService verificationService; private TzcPolicyService policyService; diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 7678ed9c..dcc0216c 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.tbs.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.qs.serve.common.model.annotation.LimitSubmit; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.enums.BudgetLogOptFlag; import com.qs.serve.common.model.consts.BudgetLogRollbackFlag; @@ -197,6 +198,7 @@ public class TbsCostApplyController { * @param id * @return */ + @LimitSubmit @PostMapping("/commit/{id}") @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.UPDATE) @PreAuthorize("hasRole('tbs:costApply:update')") diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java index 207eeac4..14a8ccd4 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java @@ -207,7 +207,7 @@ public class TbsBudgetApplicationService { budgetLqw.in(TbsBudget::getId,budgetIds); budgetLqw.and(qw->qw.eq(TbsBudget::getSubjectId,0).or(qw2->qw2.in(TbsBudget::getSubjectId,subjectIds))); //排除随货编码 - budgetLqw.ne(TbsBudget::getSubjectCode,"FYMC05"); + //budgetLqw.ne(TbsBudget::getSubjectCode,"FYMC05"); budgetLqw.in(TbsBudget::getCenterId,centerIds); budgetLqw.eq(TbsBudget::getBudgetState,1); //科目限制>品类之间>时间区间 diff --git a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java index 93ebbe73..7c41b9c2 100644 --- a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java +++ b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java @@ -1,6 +1,7 @@ package com.qs.serve.modules.tzc.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.annotation.LimitSubmit; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.enums.BudgetLogOptFlag; import com.qs.serve.common.model.consts.BudgetLogRollbackFlag; @@ -100,6 +101,7 @@ public class TzcPolicyController { * @param policyId * @return */ + @LimitSubmit @PostMapping("/commitPolicy/{policyId}") public R commitPolicy(@PathVariable("policyId")Long policyId){ policyApplicationService.commitPolicy(policyId); diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index f5f12869..ac495240 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -1,6 +1,7 @@ package com.qs.serve.modules.vtb.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.annotation.LimitSubmit; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; @@ -215,6 +216,7 @@ public class VtbVerificationController { * @param param * @return */ + @LimitSubmit @PostMapping("/commit") @SysLog(module = SystemModule.Verification, title = "核销", biz = BizType.UPDATE) @PreAuthorize("hasRole('vtb:verification:commit')") diff --git a/src/main/java/com/qs/serve/task/controller/TaskUserController.java b/src/main/java/com/qs/serve/task/controller/TaskUserController.java index d3cf4a77..3ecef914 100644 --- a/src/main/java/com/qs/serve/task/controller/TaskUserController.java +++ b/src/main/java/com/qs/serve/task/controller/TaskUserController.java @@ -30,7 +30,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @RestController @RequestMapping("/task/user") -@ConditionalOnProperty(value = "project.task", havingValue = "true") +//@ConditionalOnProperty(value = "project.task", havingValue = "true") public class TaskUserController { SeeYonRequestBaseService seeYonRequestBaseService; @@ -51,21 +51,26 @@ public class TaskUserController { } List codes = userList.stream().map(SyUser::getCode).collect(Collectors.toList()); LambdaQueryWrapper userLqw = new LambdaQueryWrapper<>(); - userLqw.in(SysUser::getCode,codes); + userLqw.in(SysUser::getAccount,codes).or() + .in(SysUser::getCode,codes); List existUserList = sysUserService.list(userLqw); for (SyUser oaUser : userList) { - boolean exist = existUserList.stream().anyMatch(a->a.getCode().equals(oaUser.getCode())); + boolean exist = existUserList.stream().anyMatch( + a->a.getAccount().equals(oaUser.getCode()) + ||a.getCode().equals(oaUser.getCode()) + ); if(!exist){ SysUser sysUser = new SysUser(); sysUser.setCode(oaUser.getCode()); sysUser.setMobile(oaUser.getMobile()); sysUser.setAccount(oaUser.getCode()); - sysUser.setId(oaUser.getName()); + sysUser.setId(oaUser.getId()); sysUser.setSyUserId(oaUser.getId()); sysUser.setSyAccount(oaUser.getCode()); sysUser.setServingState(1); sysUser.setServingDate(LocalDate.now()); sysUser.setSuperFlag(1); + sysUser.setTenantId("001"); sysUserService.save(sysUser); } }