Merge remote-tracking branch 'origin/dev' into dev

Pu Zhibing

2025-02-28 9d1ab00d884b2225b60ee3efe3c00db510f91a29

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java

@@ -11,6 +11,7 @@
import com.panzhihua.sangeshenbian.warpper.SystemUserListVo;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -28,11 +29,11 @@
    * @return
    */
   @Override
   public IPage<SystemUserListVo> list(Integer accountLevel, SystemUserList query) {
   public IPage<SystemUserListVo> list(SystemUser user, SystemUserList query) {
      Page page = new Page<>();
      page.setCurrent(query.getPageNum());
      page.setSize(query.getPageSize());
      IPage<SystemUserListVo> list = this.baseMapper.list(page, accountLevel, query);
      IPage<SystemUserListVo> list = this.baseMapper.list(page, user, query);
      return list;
   }