#

luxiaotao1123

2024-02-21 7d3040d4c742af5e13f7327e7397a0524c1ffdec

#

 zy-asrs-flow/src/pages/system/user/index.jsx

@@ -558,7 +558,7 @@
                            ],
                        }}
                        request={(params, sorter, filter) =>
                            Http.doPostPromise('/api/user/page', { ...params, ...searchParam }, (res) => {
                            Http.doPostPromise('/api/user/page1', { ...params, ...searchParam }, (res) => {
                                return {
                                    data: res.data.records,
                                    total: res.data.total,

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java

@@ -156,4 +156,8 @@
        return queryWrapper;
    }

    public Map<String, Object> pickOutMap() {
        return where.getMap();
    }

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageResult.java

New file
@@ -0,0 +1,33 @@
package com.zy.asrs.wcs.common.domain;

import lombok.Data;

import java.io.Serializable;
import java.util.List;

/**
 * @author vincent
 * @since 2017-06-10 10:10:02
 */
@Data
public class PageResult<T> implements Serializable {

    private static final long serialVersionUID = 1L;

    private List<T> records;

    private Long total;

    public PageResult() {
    }

    public PageResult(List<T> records) {
        this(records, null);
    }

    public PageResult(List<T> records, Long total) {
        this.records = records;
        this.total = total;
    }

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java

@@ -36,6 +36,14 @@
    }

    @PreAuthorize("hasAuthority('system:user:list')")
    @PostMapping("/user/page1")
    public R page1(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<User, BaseParam> pageParam = new PageParam<>(baseParam, User.class);
        return R.ok().add(userService.pageRel(pageParam));
    }

    @PreAuthorize("hasAuthority('system:user:list')")
    @PostMapping("/user/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(userService.list());

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserMapper.java

@@ -1,16 +1,22 @@
package com.zy.asrs.wcs.system.mapper;

import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.zy.asrs.wcs.system.entity.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zy.asrs.wcs.system.entity.User;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;
import java.util.Map;

@Mapper
@Repository
public interface UserMapper extends BaseMapper<User> {

    List<User> selectPageRel(@Param("page") IPage<User> page, @Param("param") Map<String, Object> param);

    @InterceptorIgnore(tenantLine = "true")
    User selectByUsername(@Param("username") String username, @Param("hostId") Long hostId);


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserService.java

@@ -1,10 +1,15 @@
package com.zy.asrs.wcs.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.common.domain.PageResult;
import com.zy.asrs.wcs.system.entity.User;

public interface UserService extends IService<User> {

    PageResult<User> pageRel(PageParam<User, BaseParam> pageParam);

    User getByUsername(String username, Long hostId);

    User getByIdRel(Long userId);

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java

@@ -2,6 +2,9 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.common.domain.PageResult;
import com.zy.asrs.wcs.system.entity.User;
import com.zy.asrs.wcs.system.mapper.UserMapper;
import com.zy.asrs.wcs.system.service.RoleMenuService;
@@ -23,6 +26,11 @@
    private BCryptPasswordEncoder bCryptPasswordEncoder;

    @Override
    public PageResult<User> pageRel(PageParam<User, BaseParam> pageParam) {
        return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.pickOutMap()), pageParam.getTotal());
    }

    @Override
    public User getByUsername(String username, Long hostId) {
        if (Cools.isEmpty(username)) {
            return null;

 zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml

@@ -13,4 +13,16 @@
        </if>
    </select>

    <select id="selectPageRel" resultType="com.zy.asrs.wcs.system.entity.User">
        select
        su.*
        from sys_user su
        left join sys_dept sd on su.dept_id = sd.id
        where 1=1
        <if test="param.deptId != null">
            and (FIND_IN_SET(#{param.deptId}, sd.`path`) OR sd.`id` = #{param.deptId})
        </if>
        order by su.create_time desc
    </select>

</mapper>