From 9f358879198dfcbe42786e064e969e9afb80a3b0 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Sun, 28 Apr 2024 14:56:37 +0800
Subject: [PATCH] user

---
 .../user/apiadmin/SysUserDefaultOrgRest.java  |   1 -
 .../com/yxt/user/apiadmin/SysUserRest.java    |   1 -
 .../yxt/user/biz/syspost/SysPostService.java  | 145 ++++++++++++++++++
 .../biz/sysstaffinfo/SysStaffinfoService.java |   4 -
 .../SysUserDefaultOrgVo.java                  |  26 ++++
 5 files changed, 171 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/com/yxt/user/biz/syspost/SysPostService.java
 create mode 100644 src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgVo.java

diff --git a/src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java b/src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java
index 804ea25..6500bdb 100644
--- a/src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java
+++ b/src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java
@@ -3,7 +3,6 @@ package com.yxt.user.apiadmin;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.user.biz.sysuserdefaultorg.SysUserDefaultOrgDto;
 import com.yxt.user.biz.sysuserdefaultorg.SysUserDefaultOrgService;
-import com.yxt.user.biz.sysuserdefaultorg.SysUserDefaultOrgVo;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/com/yxt/user/apiadmin/SysUserRest.java b/src/main/java/com/yxt/user/apiadmin/SysUserRest.java
index c0cee35..5627086 100644
--- a/src/main/java/com/yxt/user/apiadmin/SysUserRest.java
+++ b/src/main/java/com/yxt/user/apiadmin/SysUserRest.java
@@ -1,7 +1,6 @@
 package com.yxt.user.apiadmin;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.utils.*;
diff --git a/src/main/java/com/yxt/user/biz/syspost/SysPostService.java b/src/main/java/com/yxt/user/biz/syspost/SysPostService.java
new file mode 100644
index 0000000..5338914
--- /dev/null
+++ b/src/main/java/com/yxt/user/biz/syspost/SysPostService.java
@@ -0,0 +1,145 @@
+package com.yxt.user.biz.syspost;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.user.biz.sysorganization.SysOrganization;
+import com.yxt.user.biz.syspost.*;
+import com.yxt.user.biz.sysorganization.SysOrganizationService;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.user.biz.sysorganization.SysOrganizationService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPostService.java <br/>
+ * Class: com.yxt.user.biz.syspost.SysPostService <br/>
+ * Description: 岗位 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SysPostService extends MybatisBaseService<SysPostMapper, SysPost> {
+
+    @Autowired
+    private SysOrganizationService sysOrganizationService;
+
+    public PagerVo<SysPost> listPage(PagerQuery<SysPostQuery> pq) {
+        SysPostQuery query = pq.getParams();
+        QueryWrapper<SysPost> qw = createQueryWrapper(query);
+        IPage<SysPost> page = PagerUtil.queryToPage(pq);
+        IPage<SysPost> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<SysPost> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<SysPost> listAll(SysPostQuery query) {
+        QueryWrapper<SysPost> qw = createQueryWrapper(query);
+        return baseMapper.selectList(qw);
+    }
+
+    private QueryWrapper<SysPost> createQueryWrapper(SysPostQuery query) {
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<SysPost> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("post.name", query.getName());
+        }
+
+        if (StringUtils.isNotBlank(query.getOrgSid())) {
+            qw.eq("post.orgSid", query.getOrgSid());
+        }
+        return qw;
+    }
+
+    public PagerVo<SysPostVo> listPageVo(PagerQuery<SysPostQuery> pq) {
+        SysPostQuery query = pq.getParams();
+        QueryWrapper<SysPost> qw = createQueryWrapper(query);
+        IPage<SysPost> page = PagerUtil.queryToPage(pq);
+        IPage<SysPostVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<SysPostVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<SysPostVo> listAllVo(SysPostQuery query) {
+        QueryWrapper<SysPost> qw = createQueryWrapper(query);
+        return baseMapper.selectListAllVo(qw);
+    }
+
+    public List<SysPostVo> listVo() {
+        return baseMapper.selectListVo();
+    }
+
+    public void saveOrUpdateDto(SysPostDto dto) {
+        SysPost entity = new SysPost();
+        dto.fillEntity(entity);
+        this.saveOrUpdate(entity);
+    }
+
+    public SysPostVo fetchByIdVo(String id) {
+        SysPost entity = this.fetchById(id);
+        SysPostVo vo = new SysPostVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public SysPostVo fetchBySidVo(String sid) {
+        SysPost entity = baseMapper.fetchBySid(sid);
+        SysPostVo vo = new SysPostVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public List<SysPostVo> fetchByOrgSid(String orgSid) {
+        return baseMapper.fetchByOrgSid(orgSid);
+    }
+
+    public String fetchByOrgSidPostCode() {
+        List<SysPostVo> sysPostVoList = baseMapper.fetchByOrgSidPostCode();
+        String pCode = "";
+        for (SysPostVo sysPostVo : sysPostVoList) {
+            SysOrganization sysOrganizations = sysOrganizationService.selectOrgCodeByPsid();
+            String orgCode = sysOrganizations.getOrgCode();
+            String postCode = sysPostVo.getPostCode();
+            pCode = orgCode + postCode;
+        }
+        return pCode;
+    }
+
+    /**
+     * 查询所有岗位列表
+     *
+     * @return
+     */
+    public List<SysPostListVo> selectList() {
+        List<SysPostListVo> list = baseMapper.selectListOne();
+        return list;
+    }
+
+    /**
+     * 根据岗位编码查询岗位信息
+     *
+     * @param substring 岗位编码
+     * @return
+     */
+    public SysPost selectByPostCode(String substring) {
+        return baseMapper.selectByPostCode(substring);
+    }
+
+    public SysPost getPostByStaffSid(String sid) {
+        return baseMapper.getPostByStaffSid(sid);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoService.java b/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoService.java
index 50b494a..5299ea8 100644
--- a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoService.java
+++ b/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoService.java
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.user.biz.sysorganization.AppContactSysOrganizationVo;
 import com.yxt.user.biz.sysorganization.SysOrganization;
 import com.yxt.user.biz.sysrole.SysRoleVo;
-import com.yxt.user.biz.sysstaffinfo.*;
 import com.yxt.user.biz.sysstaffinfo.app.AppSysStaffQuery;
 import com.yxt.user.biz.sysstaffinfo.app.AppSysStaffVo;
 import com.yxt.user.biz.sysstafforg.SysStaffOrg;
@@ -19,7 +18,6 @@ import com.yxt.user.biz.sysstaffpost.SysStaffPostDto;
 import com.yxt.user.biz.sysuser.SysUser;
 import com.yxt.user.biz.sysuserrole.SysUserRole;
 import com.yxt.user.biz.sysorganization.SysOrganizationService;
-import com.yxt.user.biz.syspost.SysPostService;
 import com.yxt.user.biz.sysrole.SysRoleService;
 import com.yxt.user.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.user.biz.sysstaffpost.SysStaffPostService;
@@ -34,8 +32,6 @@ import com.yxt.common.base.utils.PinYinUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.user.biz.sysorganization.AppContactSysOrganizationVo;
-import com.yxt.user.biz.sysstaffinfo.app.AppSysStaffVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgVo.java b/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgVo.java
new file mode 100644
index 0000000..68d4f6d
--- /dev/null
+++ b/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgVo.java
@@ -0,0 +1,26 @@
+package com.yxt.user.biz.sysuserdefaultorg;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/11 11:52
+ * @Description
+ */
+@Data
+public class SysUserDefaultOrgVo implements Vo {
+    private static final long serialVersionUID = -4852902800844447195L;
+    
+    @ApiModelProperty("设置的默认的组织机构名称")
+    private String orgNamePath;
+    @ApiModelProperty("设置的默认的组织机构sid")
+    private String orgSidPath;
+    @ApiModelProperty("当前用户所有的组织机构list")
+    private List<SysOrgPathList> list;
+
+
+}