bug

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/AttendanceTripServiceImpl.java

@@ -13,7 +13,6 @@ import org.springblade.control.mapper.AttendanceTripMapper;
 import org.springblade.control.service.AttendanceTripService;
 import org.springblade.control.vo.AttendanceTripInfoVO;
 import org.springblade.control.vo.EMDraftVO;
-import org.springblade.control.vo.EMPurchaseInfoVO;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
@@ -42,7 +41,6 @@ public class AttendanceTripServiceImpl extends BaseServiceImpl<AttendanceTripMap
     @Override
     public IPage<AttendanceTripInfoVO> tripPage(IPage<AttendanceTripInfo> page, AttendanceTripInfoDTO dto) {
         QueryWrapper<AttendanceTripInfo> queryWrapper = Condition.getQueryWrapper(dto);
-        queryWrapper.lambda().eq(AttendanceTripInfo::getIsDeleted, 1);
         IPage<AttendanceTripInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, AttendanceTripInfo::getCreateTime));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().collect(Collectors.toMap(User::getId, User::getRealName));
         return pages.convert(obj -> {
@@ -133,7 +131,6 @@ public class AttendanceTripServiceImpl extends BaseServiceImpl<AttendanceTripMap
                 auditUserIds.add(responsibleObj.getUserId());
                 EMProcessTaskUser personnelUser = dto.getPersonnelUser(); //人事
                 auditUserIds.add(personnelUser.getUserId());
-
                 taskProcessInfo.setAuditUserIds(StringUtils.join(auditUserIds, ","));
 
                 //抄送人

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMFinancialReimbursementServiceImpl.java

@@ -42,7 +42,6 @@ public class EMFinancialReimbursementServiceImpl extends BaseServiceImpl<EMFinan
     @Override
     public IPage<EMFinancialReimbursementInfoVO> financialPage(IPage<EMFinancialReimbursementInfo> page, EMFinancialReimbursementInfoDTO dto) {
         QueryWrapper<EMFinancialReimbursementInfo> queryWrapper = Condition.getQueryWrapper(dto);
-        queryWrapper.lambda().eq(EMFinancialReimbursementInfo::getIsDeleted, 0);
         IPage<EMFinancialReimbursementInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, EMFinancialReimbursementInfo::getCreateTime));
         List<DictInfo> dictInfoList = jdbcTemplate.query("select dict_name,dict_value from c_dict_info where code = 'expense_fr_type'", new BeanPropertyRowMapper<>(DictInfo.class));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().collect(Collectors.toMap(User::getId, User::getRealName));

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMInvoiceServiceImpl.java

@@ -33,6 +33,7 @@ import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.ByteArrayInputStream;
@@ -41,7 +42,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
-@Data
+@Service
 @AllArgsConstructor
 public class EMInvoiceServiceImpl extends BaseServiceImpl<EMInvoiceMapper, EMInvoiceInfo> implements EMInvoiceService {
 
@@ -55,7 +56,6 @@ public class EMInvoiceServiceImpl extends BaseServiceImpl<EMInvoiceMapper, EMInv
     @Override
     public IPage<EMInvoiceInfoVO> invoicePage(IPage<EMInvoiceInfo> page, EMInvoiceInfoDTO dto) {
         QueryWrapper<EMInvoiceInfo> queryWrapper = Condition.getQueryWrapper(dto);
-        queryWrapper.lambda().eq(EMInvoiceInfo::getIsDeleted, 1);
         IPage<EMInvoiceInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, EMInvoiceInfo::getCreateTime));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().collect(Collectors.toMap(User::getId, User::getRealName));
         List<DictInfo> dictInfoList1 = jdbcTemplate.query("select dict_name,dict_value from c_dict_info where code = 'invoice_type'", new BeanPropertyRowMapper<>(DictInfo.class));

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMLoanServiceImpl.java

@@ -42,7 +42,6 @@ public class EMLoanServiceImpl extends BaseServiceImpl<EMLoanMapper, EMLoanInfo>
     @Override
     public IPage<EMLoanInfoVO> loanPage(IPage<EMLoanInfo> page, EMLoanInfoDTO dto) {
         QueryWrapper<EMLoanInfo> queryWrapper = Condition.getQueryWrapper(dto);
-        queryWrapper.lambda().eq(EMLoanInfo::getIsDeleted, 1);
         IPage<EMLoanInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, EMLoanInfo::getCreateTime));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().collect(Collectors.toMap(User::getId, User::getRealName));
         return pages.convert(obj -> {

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMOutsourcingPayServiceImpl.java

@@ -12,9 +12,7 @@ import org.springblade.control.entity.*;
 import org.springblade.control.mapper.EMOutsourcingPayMapper;
 import org.springblade.control.service.EMOutsourcingPayService;
 import org.springblade.control.vo.EMDraftVO;
-import org.springblade.control.vo.EMInvoiceInfoVO;
 import org.springblade.control.vo.EMOutsourcingPayInfoVO;
-import org.springblade.control.vo.EMUseCarInfoVO;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
@@ -43,7 +41,6 @@ public class EMOutsourcingPayServiceImpl extends BaseServiceImpl<EMOutsourcingPa
     @Override
     public IPage<EMOutsourcingPayInfoVO> outsourcingPage(IPage<EMOutsourcingPayInfo> page, EMOutsourcingPayInfoDTO dto) {
         QueryWrapper<EMOutsourcingPayInfo> queryWrapper = Condition.getQueryWrapper(dto);
-        queryWrapper.lambda().eq(EMOutsourcingPayInfo::getIsDeleted, 1);
         IPage<EMOutsourcingPayInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, EMOutsourcingPayInfo::getCreateTime));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().collect(Collectors.toMap(User::getId, User::getRealName));
         List<DictInfo> dictInfoList = jdbcTemplate.query("select dict_name,dict_value from c_dict_info where code = 'outsourcing_type'", new BeanPropertyRowMapper<>(DictInfo.class));

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMPayServiceImpl.java

@@ -41,7 +41,6 @@ public class EMPayServiceImpl extends BaseServiceImpl<EMPayMapper, EMPayInfo> im
     @Override
     public IPage<EMPayInfoVO> payPage(IPage<EMPayInfo> page, EMPayInfoDTO dto) {
         QueryWrapper<EMPayInfo> queryWrapper = Condition.getQueryWrapper(dto);
-        queryWrapper.lambda().eq(EMPayInfo::getIsDeleted, 1);
         IPage<EMPayInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, EMPayInfo::getCreateTime));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().collect(Collectors.toMap(User::getId, User::getRealName));
         return pages.convert(obj -> {

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMPurchaseServiceImpl.java

@@ -41,7 +41,6 @@ public class EMPurchaseServiceImpl extends BaseServiceImpl<EMPurchaseMapper, EMP
     @Override
     public IPage<EMPurchaseInfoVO> purchasePage(IPage<EMPurchaseInfo> page, EMPurchaseInfoDTO dto) {
         QueryWrapper<EMPurchaseInfo> queryWrapper = Condition.getQueryWrapper(dto);
-        queryWrapper.lambda().eq(EMPurchaseInfo::getIsDeleted, 1);
         IPage<EMPurchaseInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, EMPurchaseInfo::getCreateTime));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().collect(Collectors.toMap(User::getId, User::getRealName));
         List<DictInfo> dictInfoList = jdbcTemplate.query("select dict_name,dict_value from c_dict_info where code = 'purchase_type'", new BeanPropertyRowMapper<>(DictInfo.class));

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMUseCarServiceImpl.java

@@ -42,7 +42,6 @@ public class EMUseCarServiceImpl extends BaseServiceImpl<EMUseCarMapper, EMUseCa
     @Override
     public IPage<EMUseCarInfoVO> carPage(IPage<EMUseCarInfo> page, EMUseCarInfoDTO dto) {
         QueryWrapper<EMUseCarInfo> queryWrapper = Condition.getQueryWrapper(dto);
-        queryWrapper.lambda().eq(EMUseCarInfo::getIsDeleted, 1);
         IPage<EMUseCarInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, EMUseCarInfo::getCreateTime));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().collect(Collectors.toMap(User::getId, User::getRealName));
         return pages.convert(obj -> {

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeController.java

@@ -33,6 +33,7 @@ import org.springblade.system.enums.DictEnum;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -202,7 +203,7 @@ public class WbsTreeController extends BladeController {
             if (var) {
                 if (wbsTreeService.removeTableById(id)) {
                     //如果当前节点没有表单，那么修改is_exist_form = 0
-                    WbsTree wbsTreeZi = wbsTreeService.getBaseMapper().selectOne(Wrappers.<WbsTree>lambdaQuery().eq(WbsTree::getId, id));
+                    WbsTree wbsTreeZi = jdbcTemplate.query("select * from m_wbs_tree where is_deleted = 1 and id = " + id, new BeanPropertyRowMapper<>(WbsTree.class)).stream().findAny().orElse(null);
                     if (wbsTreeZi != null) {
                         WbsTree wbsTreeFu = wbsTreeService.getBaseMapper().selectOne(Wrappers.<WbsTree>lambdaQuery().eq(WbsTree::getId, wbsTreeZi.getParentId()));
                         if (wbsTreeFu != null) {