pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ruoyi/project/system/controller/SysUserController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/sales/SalesLedgerMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/system/SysUserMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
pom.xml
@@ -288,6 +288,14 @@ <fork>true</fork> <!-- 如果没有该配置,devtools不会生效 --> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> <source>10</source> <target>10</target> </configuration> </plugin> </plugins> </build> src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
@@ -36,6 +36,11 @@ */ @Override public void saveSupplier(SupplierManage supplierManage) { LambdaQueryWrapper<SupplierManage> supplierManageLambdaQueryWrapper = new LambdaQueryWrapper<>(); supplierManageLambdaQueryWrapper.eq(SupplierManage::getSupplierName,supplierManage.getSupplierName()); if (supplierMapper.selectCount(supplierManageLambdaQueryWrapper) > 0) { throw new RuntimeException("供应商已存在"); } supplierMapper.insert(supplierManage); } src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
@@ -13,6 +13,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -35,7 +36,12 @@ public TempFile uploadFile(MultipartFile file,Integer type) throws IOException { // 1. 生成临时文件ID和路径 String tempId = UUID.randomUUID().toString(); Path tempFilePath = Paths.get(tempDir, tempId + "_" + file.getOriginalFilename()); String originalFilename = file.getOriginalFilename(); if(originalFilename == null) throw new IOException("文件名不能为空"); String encodedFilename = java.net.URLEncoder.encode(originalFilename, StandardCharsets.UTF_8); Path tempFilePath = Paths.get(tempDir, tempId + "_" + encodedFilename); // Path tempFilePath = Paths.get(tempDir, tempId + "_" + file.getOriginalFilename()); // 2. 确保目录存在 Path parentDir = tempFilePath.getParent(); src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -269,4 +269,18 @@ List<SysUser> sysUserList = userService.userListNoPage(user); return AjaxResult.success(sysUserList); } /** * 查询当前用户公司下所有用户 * @param user * @return */ @GetMapping("/userListNoPageByTenantId") public AjaxResult userListNoPageByTenantId(SysUser user){ //获取登录用户信息 SysUser loginUser = SecurityUtils.getLoginUser().getUser(); user.setTenantId(loginUser.getTenantId()); List<SysUser> sysUserList = userService.userListNoPage(user); return AjaxResult.success(sysUserList); } } src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
@@ -555,9 +555,6 @@ */ @Override public List<SysUser> userListNoPage(SysUser user) { //获取登录用户信息 SysUser loginUser = SecurityUtils.getLoginUser().getUser(); user.setTenantId(loginUser.getTenantId()); return userMapper.selectUserList(user); } src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -178,6 +178,7 @@ List<Long> salesLedgerIds = iPage.getRecords().stream().map(SalesLedger::getId).collect(Collectors.toList()); List<InvoiceLedgerDto> invoiceLedgerDtoList = invoiceLedgerMapper.invoicedTotal(salesLedgerIds); if(CollectionUtils.isEmpty(invoiceLedgerDtoList)){ iPage.setTotal(iPage.getRecords().size()); return iPage; } for (SalesLedger salesLedger : iPage.getRecords()) { @@ -204,6 +205,7 @@ iPage.getRecords().removeIf(salesLedger -> Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00"))); } } iPage.setTotal(iPage.getRecords().size()); return iPage; } } src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -29,7 +29,7 @@ T1.tenant_id, T1.contract_amount, T1.execution_date, T2.nick_name AS entry_person_name T2.nick_name AS entry_person_name, T1.payment_method FROM sales_ledger T1 src/main/resources/mapper/system/SysUserMapper.xml
@@ -64,7 +64,10 @@ LEFT JOIN sys_dept T2 ON T1.dept_id = T2.dept_id GROUP BY T1.user_id ) T2 on T2.user_id = u.user_id where u.del_flag = '0' and u.tenant_id = #{tenantId} where u.del_flag = '0' <if test="tenantId != null and tenantId != 0"> and u.tenant_id = #{tenantId} </if> <if test="userId != null and userId != 0"> AND u.user_id = #{userId} </if>