1cba2635de31d32dbe629304c1e5a4cc1ebda529..69155f0115473d6c17bb7441bc1c7b06e05173ef
2024-08-27 ZQN
Merge remote-tracking branch 'origin/master'
69155f 对比 | 目录
2024-08-15 ZQN
企业二维码样式修改
2562d6 对比 | 目录
4个文件已修改
14 ■■■■ 已修改文件
project-admin/src/main/java/com/project/ProjectApplication.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
project-admin/src/main/java/com/project/ProjectApplication.java
@@ -3,6 +3,7 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.scheduling.annotation.EnableAsync;
/**
@@ -11,6 +12,7 @@
 * @author project
 */
@EnableAsync
@EnableCaching
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class ProjectApplication
{
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
@@ -25,6 +25,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
@@ -47,6 +48,7 @@
    @ApiOperation("获取同行人")
    @GetMapping("/peerList")
    @Cacheable(value = "sysUser:peerList")
    public AjaxResult peerList(String nickName, String deptId)
    {
        List<SysUser> list = userService.list(userService.lq()
@@ -54,7 +56,7 @@
                .ne(SysUser::getUserName,"admin")
                .ne(SysUser::getUserId, SecurityUtils.getUserId())
                .like(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
                .eq(deptId!=null, SysUser::getDeptId,deptId)
                .eq(deptId!=null, SysUser::getDeptId, deptId)
        );
        list.forEach(user->{
            SysDept sysDept = deptService.selectDeptById(user.getDeptId());
project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java
@@ -15,6 +15,7 @@
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -28,7 +29,7 @@
@Data
@NoArgsConstructor
public class SysUser
public class SysUser implements Serializable
{
    private static final long serialVersionUID = 1L;
project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java
@@ -28,6 +28,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -264,6 +265,7 @@
     */
    @Override
    @Transactional
    @CacheEvict(value = "sysUser:peerList",allEntries = true)
    public int insertUser(SysUser user)
    {
        // 新增用户信息
@@ -299,6 +301,7 @@
     */
    @Override
    @Transactional
    @CacheEvict(value = "sysUser:peerList",allEntries = true)
    public int updateUser(SysUser user)
    {
        Long userId = user.getUserId();
@@ -481,6 +484,7 @@
     */
    @Override
    @Transactional
    @CacheEvict(value = "sysUser:peerList",allEntries = true)
    public int deleteUserById(Long userId)
    {
        // 删除用户与角色关联
@@ -498,6 +502,7 @@
     */
    @Override
    @Transactional
    @CacheEvict(value = "sysUser:peerList",allEntries = true)
    public int deleteUserByIds(Long[] userIds)
    {
        for (Long userId : userIds)