员工增删改查接口修改，微信消息模版

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfig.java

@@ -0,0 +1,20 @@
+package com.yxt.supervise.portal.api.templatestaffconfig;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:34
+ */
+@Data
+@ApiModel(value = "模板 员工关联表", description = "模板 员工关联表")
+@TableName("template_staff_config")
+public class TemplateStaffConfig extends BaseEntity {
+    //模板sid
+    private String templateSid;
+    //员工sid
+    private String staffSid;
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDetailsVo.java

@@ -0,0 +1,20 @@
+package com.yxt.supervise.portal.api.templatestaffconfig;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:35
+ */
+@Data
+@ApiModel(value = "模板 员工关联表 视图数据详情", description = "模板 员工关联表 视图数据详情")
+public class TemplateStaffConfigDetailsVo implements Vo {
+    private String id;
+    //模板sid
+    private String templateSid;
+    //员工sid
+    private String staffSid;
+    private String sid;
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDto.java

@@ -0,0 +1,20 @@
+package com.yxt.supervise.portal.api.templatestaffconfig;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:35
+ */
+@Data
+@ApiModel(value = "模板 员工关联表 数据传输对象", description = "模板 员工关联表 数据传输对象")
+public class TemplateStaffConfigDto implements Dto {
+    private String id;
+    //模板sid
+    private String templateSid;
+    //员工sid
+    private String staffSid;
+    private String sid;
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeign.java

@@ -0,0 +1,17 @@
+package com.yxt.supervise.portal.api.templatestaffconfig;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:35
+ */
+@Api(tags = "模板 员工关联表")
+@FeignClient(
+        contextId = "yxt-supervise-TemplateStaffConfig",
+        name = "yxt-supervise",
+        path = "v1/templatestaffconfig",
+        fallback = TemplateStaffConfigFeignFallback.class)
+public interface TemplateStaffConfigFeign {
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeignFallback.java

@@ -0,0 +1,11 @@
+package com.yxt.supervise.portal.api.templatestaffconfig;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:35
+ */
+@Component
+public class TemplateStaffConfigFeignFallback implements TemplateStaffConfigFeign{
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.supervise.portal.api.templatestaffconfig;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:35
+ */
+@Data
+@ApiModel(value = "模板 员工关联表 查询条件", description = "模板 员工关联表 查询条件")
+public class TemplateStaffConfigQuery implements Vo {
+    private String id;
+    //模板sid
+    private String templateSid;
+    //员工sid
+    private String staffSid;
+    private String sid;
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigVo.java

@@ -0,0 +1,20 @@
+package com.yxt.supervise.portal.api.templatestaffconfig;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:35
+ */
+@Data
+@ApiModel(value = "模板 员工关联表 视图数据对象", description = "模板 员工关联表 视图数据对象")
+public class TemplateStaffConfigVo implements Vo {
+    private String id;
+    //模板sid
+    private String templateSid;
+    //员工sid
+    private String staffSid;
+    private String sid;
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplate.java

@@ -0,0 +1,31 @@
+package com.yxt.supervise.portal.api.wechattemplate;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 11:34
+ */
+@Data
+@ApiModel(value = "微信消息模版", description = "微信消息模版")
+@TableName("wechat_template")
+public class WechatTemplate extends BaseEntity {
+    //id
+    //private String id;
+    //模版id
+    @ApiModelProperty("模版id")
+    private String templateId;
+    //标题
+    @ApiModelProperty("标题")
+    private String title;
+    //格式
+    @ApiModelProperty("格式")
+    private String json;
+    //行业
+    @ApiModelProperty("行业")
+    private String trade;
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDetailVo.java

@@ -0,0 +1,27 @@
+package com.yxt.supervise.portal.api.wechattemplate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 11:34
+ */
+@Data
+@ApiModel(value = "微信消息模版 视图数据详情", description = "微信消息模版 视图数据详情")
+public class WechatTemplateDetailVo implements Vo {
+    private String id;
+    @ApiModelProperty("模版id")
+    private String templateId;
+    //标题
+    @ApiModelProperty("标题")
+    private String title;
+    //格式
+    @ApiModelProperty("格式")
+    private String json;
+    //行业
+    @ApiModelProperty("行业")
+    private String trade;
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.portal.api.wechattemplate;
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfig;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 11:35
+ */
+@Data
+@ApiModel(value = "微信消息模版 数据传输对象", description = "微信消息模版 数据传输对象")
+public class WechatTemplateDto implements Dto {
+    private String id;
+    private String sid; // sid
+    @ApiModelProperty("模版id")
+    private String templateId;
+    //标题
+    @ApiModelProperty("标题")
+    private String title;
+    //格式
+    @ApiModelProperty("格式")
+    private String json;
+    //行业
+    @ApiModelProperty("行业")
+    private String trade;
+    private List<TemplateStaffConfig> templateStaffConfigs;
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeign.java

@@ -0,0 +1,18 @@
+package com.yxt.supervise.portal.api.wechattemplate;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 11:35
+ */
+@Api(tags = "微信模版消息")
+@FeignClient(
+        contextId = "com.supervise-WechatTemplate",
+        name = "com.supervise",
+        path = "v1/wechattemplate",
+        fallback = WechatTemplateFeignFallback.class)
+public interface WechatTemplateFeign {
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeignFallback.java

@@ -0,0 +1,11 @@
+package com.yxt.supervise.portal.api.wechattemplate;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 11:35
+ */
+@Component
+public class WechatTemplateFeignFallback implements WechatTemplateFeign{
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java

@@ -0,0 +1,27 @@
+package com.yxt.supervise.portal.api.wechattemplate;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 11:35
+ */
+@Data
+@ApiModel(value = "微信消息模版 查询条件", description = "微信消息模版 查询条件")
+public class WechatTemplateQuery implements Query {
+    private String id;
+    @ApiModelProperty("模版id")
+    private String templateId;
+    //标题
+    @ApiModelProperty("标题")
+    private String title;
+    //格式
+    @ApiModelProperty("格式")
+    private String json;
+    //行业
+    @ApiModelProperty("行业")
+    private String trade;
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java

@@ -0,0 +1,27 @@
+package com.yxt.supervise.portal.api.wechattemplate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 11:35
+ */
+@Data
+@ApiModel(value = "微信消息模版 视图数据对象", description = "微信消息模版 视图数据对象")
+public class WechatTemplateVo implements Vo {
+    private String id;
+    @ApiModelProperty("模版id")
+    private String templateId;
+    //标题
+    @ApiModelProperty("标题")
+    private String title;
+    //格式
+    @ApiModelProperty("格式")
+    private String json;
+    //行业
+    @ApiModelProperty("行业")
+    private String trade;
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.java

@@ -0,0 +1,20 @@
+package com.yxt.supervise.portal.biz.templatestaffconfig;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfig;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplate;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:45
+ */
+@Mapper
+public interface TemplateStaffConfigMapper extends BaseMapper<TemplateStaffConfig> {
+    IPage<WechatTemplateVo> selectPageVo(IPage<WechatTemplate> page, @Param(Constants.WRAPPER) Wrapper<WechatTemplate> qw);
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.portal.biz.templatestaffconfig.TemplateStaffConfigMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfigVo">
+        SELECT * FROM wechat_template <where> ${ew.sqlSegment} </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfigVo">
+        SELECT * FROM wechat_template <where> ${ew.sqlSegment} </where>
+    </select>
+</mapper>

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigRest.java

@@ -0,0 +1,16 @@
+package com.yxt.supervise.portal.biz.templatestaffconfig;
+
+import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfigFeign;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:45
+ */
+@Api(tags = "消息 员工关联表")
+@RestController
+@RequestMapping("v1/templatestaffconfig")
+public class TemplateStaffConfigRest implements TemplateStaffConfigFeign {
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigService.java

@@ -0,0 +1,13 @@
+package com.yxt.supervise.portal.biz.templatestaffconfig;
+
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:45
+ */
+@Service
+public class TemplateStaffConfigService extends MybatisBaseService<TemplateStaffConfigMapper, TemplateStaffConfig> {
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.portal.biz.wechattemplate;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplate;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 10:34
+ */
+@Mapper
+public interface WechatTemplateMapper extends BaseMapper<WechatTemplate> {
+    IPage<WechatTemplateVo> selectPageVo(IPage<WechatTemplate> page, @Param(Constants.WRAPPER) Wrapper<WechatTemplate> qw);
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.portal.biz.wechattemplate.WechatTemplateMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo">
+        SELECT * FROM wechat_template <where> ${ew.sqlSegment} </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo">
+        SELECT * FROM wechat_template <where> ${ew.sqlSegment} </where>
+    </select>
+</mapper>

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java

@@ -0,0 +1,54 @@
+package com.yxt.supervise.portal.biz.wechattemplate;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateDto;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateFeign;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateQuery;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 10:35
+ */
+@Api(tags = "微信消息模版")
+@RestController
+@RequestMapping("v1/wechattemplate")
+public class WechatTemplateRest implements WechatTemplateFeign {
+    @Autowired
+    WechatTemplateService wechatTemplateService;
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<WechatTemplateVo>> listPage(@RequestBody PagerQuery<WechatTemplateQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<WechatTemplateVo> pv = wechatTemplateService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("新增")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody WechatTemplateDto dto){
+        ResultBean rb = ResultBean.fireFail();
+        wechatTemplateService.save(dto);
+        return  rb.success().setMsg(rb.getMsg());
+    }
+    @ApiOperation("修改")
+    @PostMapping("/update")
+    public ResultBean update(@RequestBody WechatTemplateDto dto){
+        ResultBean rb = ResultBean.fireFail();
+        wechatTemplateService.update(dto);
+        return  rb.success().setMsg(rb.getMsg());
+    }
+    @ApiOperation("删除")
+    @DeleteMapping("/delete/{sid}")
+    @ResponseBody
+    public ResultBean delete(@PathVariable String sid){
+        ResultBean rb = ResultBean.fireFail();
+        wechatTemplateService.deleteById(sid);
+        return  rb.success().setMsg(rb.getMsg());
+    }
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java

@@ -0,0 +1,88 @@
+package com.yxt.supervise.portal.biz.wechattemplate;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfig;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplate;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateDto;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateQuery;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo;
+import com.yxt.supervise.portal.biz.templatestaffconfig.TemplateStaffConfigService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 10:36
+ */
+@Service
+public class WechatTemplateService extends MybatisBaseService<WechatTemplateMapper, WechatTemplate> {
+
+    @Autowired
+    private TemplateStaffConfigService templateStaffConfigService;
+
+
+    public PagerVo<WechatTemplateVo> listPageVo(PagerQuery<WechatTemplateQuery> pq) {
+        WechatTemplateQuery query = pq.getParams();
+        QueryWrapper<WechatTemplate> qw = new QueryWrapper<>();
+        IPage<WechatTemplate> page = PagerUtil.queryToPage(pq);
+        IPage<WechatTemplateVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<WechatTemplateVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public ResultBean save(WechatTemplateDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+
+        WechatTemplate entity=new WechatTemplate();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        List<TemplateStaffConfig> entitys=new ArrayList<>();
+        if(dto.getTemplateStaffConfigs().size()>0){
+            for(TemplateStaffConfig templateStaffConfig:dto.getTemplateStaffConfigs()){
+                BeanUtil.copyProperties(dto, templateStaffConfig, "id", "sid");
+                templateStaffConfig.setTemplateSid(entity.getSid());
+                entitys.add(templateStaffConfig);
+            }
+
+            templateStaffConfigService.saveBatch(entitys);
+        }
+        return rb.success().setMsg("添加模板信息成功");
+    }
+    public ResultBean update(WechatTemplateDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return rb.success().setMsg("添加模板信息成功");
+        }
+        WechatTemplate entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+        List<TemplateStaffConfig> entitys=new ArrayList<>();
+        if(dto.getTemplateStaffConfigs().size()>0){
+            templateStaffConfigService.deleteBySid(entity.getSid());
+            for(TemplateStaffConfig templateStaffConfig:dto.getTemplateStaffConfigs()){
+                BeanUtil.copyProperties(dto, templateStaffConfig, "id", "sid");
+                templateStaffConfig.setTemplateSid(entity.getSid());
+                entitys.add(templateStaffConfig);
+            }
+            templateStaffConfigService.saveBatch(entitys);
+        }
+        return rb.success().setMsg("添加模板信息成功");
+    }
+    public ResultBean deleteById(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        int i=baseMapper.deleteById(sid);
+        templateStaffConfigService.deleteBySid(sid);
+        return rb.success().setMsg("添加模板信息成功");
+    }
+}

yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java

@@ -7,6 +7,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Delete;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
@@ -44,6 +45,9 @@ public interface SysStaffinfoFeign {
     @ApiOperation("员工管理分页列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<SysStaffinfoVo>> listPage(@RequestBody PagerQuery<SysStaffinfoQuery> pq);
+    @ApiOperation("查询所有的员工")
+    @PostMapping("/getAllStaffinfo")
+    public ResultBean<List<SysStaffinfoVo>> getAllStaffinfo();
     @ApiOperation("员工管理分页列表 新")
     @PostMapping("/listPageNew")
     public ResultBean<PagerVo<SysStaffinfoVo>> listPageNew(@RequestBody PagerQuery<SysStaffinfoQuery> pq);
@@ -82,6 +86,10 @@ public interface SysStaffinfoFeign {
     @ApiOperation("设置离职")
     @PostMapping("/del")
     public ResultBean del(@RequestBody SysStaffQuery sysStaffQuery);
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySid/{sid}")
+    @ResponseBody
+    public ResultBean delBySid(@PathVariable("sid")String sid);
 
     /**
      * 员工信息编辑初始化及详情

yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java

@@ -31,6 +31,12 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui_portal/sysstaffinfo/listPage无法访问");
     }
+
+    @Override
+    public ResultBean<List<SysStaffinfoVo>> getAllStaffinfo() {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<SysStaffinfoVo>> listPageNew(PagerQuery<SysStaffinfoQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -61,6 +67,11 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         return null;
     }
 
+    @Override
+    public ResultBean delBySid(String sid) {
+        return null;
+    }
+
 
     @Override
     public ResultBean<SysStaffinfoDetailsVo> fetchBySid(String sid) {

yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java

@@ -24,15 +24,15 @@ import javax.validation.constraints.NotBlank;
 @ApiModel(value = "用户表 数据传输对象", description = "用户表 数据传输对象")
 @Data
 public class SysUserDto implements Dto {
-	@ApiModelProperty("手机号")
+    @ApiModelProperty("手机号")
     private String mobile;
-	@ApiModelProperty("用户类型:1员工、2客户、3供应商")
+    @ApiModelProperty("用户类型:1员工、2客户、3供应商")
     private Integer userType;
     @ApiModelProperty(value = "姓名", required = true)
-    @NotBlank(message = "姓名不能为空")
+    //@NotBlank(message = "姓名不能为空")
     private String name;
     @ApiModelProperty(value = "验证码", required = true)
-    @NotBlank(message = "验证码不能为空")
+    //@NotBlank(message = "验证码不能为空")
     private String verificationCode;
     @ApiModelProperty(value = "部门sid")
     private String deptSid;

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java

@@ -114,6 +114,8 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
     int updateBySid(@Param("personType") String personType, @Param("personTypeKey") String personTypeKey,
                     @Param("sid") String sid, @Param("date") Date date, @Param("reason") String reason);
 
+    int deleteBySid(@Param("sid") String sid);
+
     /**
      * 查询当前分公司下的员工信息
      *
@@ -122,6 +124,8 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
      */
     List<PcSysStaffVo> selectStaffList(String orgSid);
 
+    List<SysStaffinfoVo> selectAllStaffinfo();
+
     List<Map<String, String>> getStaffName(@Param(Constants.WRAPPER) Wrapper<Map<String, Object>> qw);
 
     List<Map<String, String>> getStaffNameByDeptSid(@Param(Constants.WRAPPER) Wrapper<Map<String, Object>> qw);

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml

@@ -9,21 +9,21 @@
         SELECT staff.sid, staff.name, staff.mobile, staff.pinYinName, staff.firstPinYinLabel, user.headImage
         FROM sys_staffinfo staff
                  LEFT JOIN sys_user user
-                           ON staff.sid = user.staffSid
+        ON staff.sid = user.staffSid
         ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName
     </select>
 
     <select id="searchAppContactsPageList"
             resultType="com.yxt.supervise.system.sysstaffinfo.SysStaffinfoAppContactsSearchVo">
         SELECT staff.sid,
-               staff.name,
-               staff.mobile,
-               staff.position,
-               user.headImage,
-               GROUP_CONCAT(org.orgName SEPARATOR '/') orgName
+        staff.name,
+        staff.mobile,
+        staff.position,
+        user.headImage,
+        GROUP_CONCAT(org.orgName SEPARATOR '/') orgName
         FROM sys_staffinfo staff
-                 LEFT JOIN sys_staff_org org ON org.staffSid = staff.sid
-                 LEFT JOIN sys_user user ON staff.sid = user.staffSid
+        LEFT JOIN sys_staff_org org ON org.staffSid = staff.sid
+        LEFT JOIN sys_user user ON staff.sid = user.staffSid
         WHERE 1 = 1
         <if test="mobileStr != null and mobileStr != ''">
             AND staff.mobile LIKE concat('%', #{mobileStr}, '%')
@@ -49,8 +49,8 @@
                GROUP_CONCAT(org.orgNamePath SEPARATOR '/') orgNamePath
         FROM sys_staffinfo staff
                  LEFT JOIN sys_user user
-                           ON staff.sid = user.staffSid
-                 LEFT JOIN sys_staff_org org ON staff.sid = org.staffSid
+        ON staff.sid = user.staffSid
+            LEFT JOIN sys_staff_org org ON staff.sid = org.staffSid
         WHERE staff.sid = #{staffSid}
         GROUP BY staff.sid
     </select>
@@ -68,7 +68,7 @@
         FROM sys_staff_org org
                  INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid
                  LEFT JOIN sys_user user
-                           ON staff.sid = user.staffSid
+        ON staff.sid = user.staffSid
         WHERE org.orgSid = #{sid}
     </select>
     <!--根据员工类型key查询员工工号的最大号-->
@@ -76,7 +76,7 @@
         select *
         from sys_staffinfo
         order by jobNumber desc
-        limit 1
+            limit 1
     </select>
     <!--根据手机号查询员工是否重复-->
     <select id="selectByMobile" resultType="com.yxt.supervise.system.sysstaffinfo.SysStaffinfo">
@@ -105,24 +105,24 @@
         DATE_FORMAT(si.joinCompnyDate, '%Y-%m-%d') AS joinCompnyDate,
         <!--所在部门-->
         (select GROUP_CONCAT(orgName SEPARATOR ',') orgName from sys_staff_org so where so.staffSid = si.sid) as
-            orgName,
+        orgName,
         <!--所在部门sid-->
         (select GROUP_CONCAT(orgSid SEPARATOR ',') orgSid from sys_staff_org so where so.staffSid = si.sid) as
-            orgSid,
+        orgSid,
         <!--岗位-->
         (select GROUP_CONCAT(sp.name SEPARATOR ',') postName
-         from sys_staff_post ssp
-                  left join sys_post sp on
-                 sp.sid =
-                 ssp.postSid
-         where ssp.staffSid = si.sid
-         group by ssp.id) as postName
+        from sys_staff_post ssp
+        left join sys_post sp on
+        sp.sid =
+        ssp.postSid
+        where ssp.staffSid = si.sid
+        group by ssp.id) as postName
         from sys_staffinfo si
-                 LEFT JOIN sys_staff_org so
-                           ON so.staffSid = si.sid
-                 LEFT JOIN sys_staff_post ssp
-                           ON ssp.staffSid = si.sid
-            ${ew.customSqlSegment}
+        LEFT JOIN sys_staff_org so
+        ON so.staffSid = si.sid
+        LEFT JOIN sys_staff_post ssp
+        ON ssp.staffSid = si.sid
+        ${ew.customSqlSegment}
     </select>
     <select id="pagerListNew" resultType="com.yxt.supervise.system.sysstaffinfo.SysStaffinfoVo">
         SELECT DISTINCT sta.Sid,
@@ -176,7 +176,9 @@
             LEFT JOIN sys_role role ON role.sid = user_role.roleSid
             LEFT JOIN dict_common dict ON dict.dictKey = user.userType AND dict.dictType = 'userType'
             LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid
-        ${ew.customSqlSegment}
+            left JOIN sys_staff_org staorg on staorg.staffSid=sta.sid
+            left join sys_organization organ on staorg.orgSid=organ.sid
+            ${ew.customSqlSegment}
     </select>
     <!--根据员工手机号和sid查询员工信息是否已存在-->
     <select id="selectByMobileAndSid" resultType="com.yxt.supervise.system.sysstaffinfo.SysStaffinfo">
@@ -304,8 +306,8 @@
         isHaveInsurance,
         <!--意外险参保：1是，0否-->
         case isHaveInsurance
-            when 1 then '是'
-            when 0 then '否' end as isHaveInsuranceValue,
+        when 1 then '是'
+        when 0 then '否' end as isHaveInsuranceValue,
         <!--意外险参保时间-->
         DATE_FORMAT(insuranceStartDate, '%Y-%m-%d') as insuranceStartDate,
         <!--意外险参保终止日期-->
@@ -316,26 +318,26 @@
         isHaveAged,
         <!--养老:1是，0否-->
         case isHaveAged
-            when 1 then '是'
-            when 0 then '否' end as isHaveAgedValue,
+        when 1 then '是'
+        when 0 then '否' end as isHaveAgedValue,
         <!--医疗:1是，0否-->
         isHaveMedical,
         <!--医疗:1是，0否-->
         case isHaveMedical
-            when 1 then '是'
-            when 0 then '否' end as isHaveMedicalValue,
+        when 1 then '是'
+        when 0 then '否' end as isHaveMedicalValue,
         <!--工伤：1是，0否-->
         isHaveInjury,
         <!--工伤：1是，0否-->
         case isHaveInjury
-            when 1 then '是'
-            when 0 then '否' end as isHaveInjuryValue,
+        when 1 then '是'
+        when 0 then '否' end as isHaveInjuryValue,
         <!--失业：1是，0否-->
         isHaveUnemploy,
         <!--失业：1是，0否-->
         case isHaveUnemploy
-            when 1 then '是'
-            when 0 then '否' end as isHaveUnemployValue,
+        when 1 then '是'
+        when 0 then '否' end as isHaveUnemployValue,
         <!--社保参保地-->
         insuredPlace,
         <!--纸质档案保管地-->
@@ -360,6 +362,11 @@
             quitReason    = #{reason}
         where sid = #{sid}
     </update>
+
+    <delete id="deleteBySid">
+        delete from sys_staffinfo
+        where sid = #{sid}
+    </delete>
     <!--查询当前分公司下的员工信息-->
     <select id="selectStaffList" resultType="com.yxt.supervise.system.sysstaffinfo.PcSysStaffVo">
         select sso.staffSid, si.name staffName
@@ -368,6 +375,10 @@
         where find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ','))
     </select>
 
+    <select id="selectAllStaffinfo" resultType="com.yxt.supervise.system.sysstaffinfo.SysStaffinfoVo">
+        select *
+        from sys_staffinfo
+    </select>
     <select id="getStaffName" resultType="java.util.Map">
         SELECT DISTINCT ss.sid, ss.name
         FROM sys_staffinfo ss
@@ -387,23 +398,23 @@
 
     <select id="getUserList" resultType="com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffVo">
         select su.sid         userSid,
-               si.name        userName,
-               su.headImage,
-               si.mobile      userMobile,
-               sso.orgName as department,
-               sp.name
+        si.name        userName,
+        su.headImage,
+        si.mobile      userMobile,
+        sso.orgName as department,
+        sp.name
         from sys_staff_org sso
-                 left join sys_staffinfo si on sso.staffSid = si.sid
-                 left join sys_user su on si.sid = su.staffSid
-                 left join sys_staff_post ssp on si.sid = ssp.staffSid
-                 left join sys_post sp on sp.sid = ssp.postSid
+        left join sys_staffinfo si on sso.staffSid = si.sid
+        left join sys_user su on si.sid = su.staffSid
+        left join sys_staff_post ssp on si.sid = ssp.staffSid
+        left join sys_post sp on sp.sid = ssp.postSid
         <where>
             ${ew.sqlSegment}
             <if test="orgSid != null and orgSid != ''">
                 and find_in_set(#{orgSid}
-                  , replace (sso.orgSidPath
-                  , '/'
-                  , ','))
+                , replace (sso.orgSidPath
+                , '/'
+                , ','))
             </if>
         </where>
         group by su.sid
@@ -411,22 +422,22 @@
 
     <select id="getGressionUserList" resultType="com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffVo">
         select su.sid      as userSid,
-               si.name     as userName,
-               su.headImage,
-               si.mobile   as userMobile,
-               sso.orgName as department,
-               sp.name
+        si.name     as userName,
+        su.headImage,
+        si.mobile   as userMobile,
+        sso.orgName as department,
+        sp.name
         from sys_staff_org sso
-                 left join sys_staffinfo si on sso.staffSid = si.sid
-                 left join sys_user su on si.sid = su.staffSid
-                 left join sys_staff_post ssp on si.sid = ssp.staffSid
-                 left join sys_post sp on sp.sid = ssp.postSid
+        left join sys_staffinfo si on sso.staffSid = si.sid
+        left join sys_user su on si.sid = su.staffSid
+        left join sys_staff_post ssp on si.sid = ssp.staffSid
+        left join sys_post sp on sp.sid = ssp.postSid
         <where>
             <if test="userOrgSid != null and userOrgSid != ''">
                 and find_in_set(#{userOrgSid}
-                        , replace(sso.orgSidPath
-                                    , '/'
-                                    , ','))
+                , replace(sso.orgSidPath
+                , '/'
+                , ','))
             </if>
         </where>
     </select>

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java

@@ -1,8 +1,10 @@
 package com.yxt.supervise.system.sysstaffinfo;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffQuery;
 import com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffVo;
+import com.yxt.supervise.system.sysuser.SysUser;
 import com.yxt.supervise.system.sysuser.SysUserService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.PagerUtil;
@@ -64,6 +66,11 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         PagerVo<SysStaffinfoVo> pv1 = PagerUtil.pageToVo(page, pv);
         return rb.success().setData(pv1);
     }
+    public ResultBean<List<SysStaffinfoVo>> getAllStaffinfo() {
+        ResultBean<List<SysStaffinfoVo>> rb = ResultBean.fireFail();
+        List<SysStaffinfoVo> list = sysStaffinfoService.getAllStaffinfo();
+        return rb.success().setData(list);
+    }
     @Override
     public ResultBean<PagerVo<SysStaffinfoVo>> listPageNew(@RequestBody PagerQuery<SysStaffinfoQuery> pq) {
         ResultBean<PagerVo<SysStaffinfoVo>> rb = ResultBean.fireFail();
@@ -145,6 +152,22 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         return rb.success().setMsg("成功");
     }
 
+    @Override
+    public ResultBean delBySid(String sid) {
+        System.out.println(sid);
+        ResultBean rb = ResultBean.fireFail();
+        //删除员工
+        int i=sysStaffinfoService.delByIds(sid);
+        //删除用户
+        SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("staffSid",sid));
+        sysUserService.delBySid(sysUser.getSid());
+        if(i>0){
+            return rb.success().setMsg("成功");
+        }else{
+            return rb.success().setMsg("失败");
+        }
+    }
+
     @Override
     public ResultBean<SysStaffinfoDetailsVo> fetchBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java

@@ -199,7 +199,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         }
         return sysStaffinfoVoIPage;
     }
-
+    public List<SysStaffinfoVo> getAllStaffinfo() {
+        List<SysStaffinfoVo> sysStaffinfoVoList=baseMapper.selectAllStaffinfo();
+        return sysStaffinfoVoList;
+    }
     public IPage<SysStaffinfoVo> lpagerListNew(PagerQuery<SysStaffinfoQuery> pagerQuery) {
         // mybits所用的分页对对象
         IPage<SysStaffinfoQuery> page = PagerUtil.queryToPage(pagerQuery);
@@ -217,12 +220,12 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
             qw.like("role.name", query.getRoleName());
         }
         if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getOrgName())) {
-            qw.like("org.name", query.getOrgName());
+            qw.like("organ.name", query.getOrgName());
         }
         if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getMobile())) {
-            qw.eq("sta.mobile", query.getMobile());
+            qw.like("sta.mobile", query.getMobile());
         }
-        qw.ne("staff.personTypeKey","01");
+//        qw.ne("staff.personTypeKey","01");
         IPage<SysStaffinfoVo> sysStaffinfoVoIPage = baseMapper.pagerListNew(page, qw);
         List<SysStaffinfoVo> records = sysStaffinfoVoIPage.getRecords();
         for (SysStaffinfoVo record : records) {
@@ -459,10 +462,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
 //            return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工");
 //        }
         //判断身份证号出生日期和填写的出生日期是否相同
-        String idNo = dto.getIdNo();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
-        String birthday = simpleDateFormat.format(dto.getBirthday());
-        String substring = idNo.substring(6, 14);
+//        String idNo = dto.getIdNo();
+//        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+//        String birthday = simpleDateFormat.format(dto.getBirthday());
+//        String substring = idNo.substring(6, 14);
 //        if (!birthday.equals(substring)) {
 //            return rb.setMsg("选择的出生日期和身份证出生日期不符，请重新选择");
 //        }
@@ -554,13 +557,14 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
 //        if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) {
 //            return rb.setMsg("所在部门不能为空");
 //        }
-        sysStaffOrgDto.fillEntity(sysStaffOrg);
+        //sysStaffOrgDto.fillEntity(sysStaffOrg);
+        sysStaffOrg.setOrgSid(sysStaffOrgDto.getOrgSid());
         sysStaffOrg.setStaffSid(sysStaffinfo3.getSid());
         sysStaffOrg.setManageType("3");
         sysStaffOrgService.save(sysStaffOrg);
         //增加员工的关联的岗位信息
         SysStaffPost sysStaffPost = new SysStaffPost();
-        SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost();
+        //SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost();
 //        if (StringUtils.isBlank(sysStaffPostDto.getPostSid())) {
 //            return rb.setMsg("岗位不能为空");
 //        }
@@ -576,10 +580,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         String md5 = Encodes.md5(password);
         sysUser.setPassword(md5);
         boolean isSave = sysUserService.save(sysUser);
-        sysStaffPostDto.fillEntity(sysStaffPost);
+        //sysStaffPostDto.fillEntity(sysStaffPost);
         sysStaffPost.setStaffSid(sysStaffinfo3.getSid());
         sysStaffPost.setStartDate(new Date());
-        sysStaffPostService.save(sysStaffPost);
+        //sysStaffPostService.save(sysStaffPost);
         if (!isSave) {
             return rb.setMsg("添加员工信息失败");
         }
@@ -817,7 +821,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
 //        if (sysStaffinfo3 != null) {
 //            return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工");
 //        }
-        //更新员工基础信息
+        //更新用户基础信息
         BeanUtil.copyProperties(dto, sysStaffinfo);
         sysStaffinfo.setJobNumber(dto.getJobNumber());
         sysStaffinfo.setPinYinName(PinYinUtils.getPinYinName(dto.getName()));
@@ -918,14 +922,14 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         }
 
         //更新员工的关联的岗位信息
-        SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid);
-        SysStaffPost sysStaffPost = sysStaffPostService.selectByStaffSid(sid, staffPostDetailsVo.getPostSid());
-        SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost();
-        sysStaffPostService.updateBySid(sysStaffPostDto, sysStaffPost.getSid());
+//        SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid);
+//        SysStaffPost sysStaffPost = sysStaffPostService.selectByStaffSid(sid, staffPostDetailsVo.getPostSid());
+//        SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost();
+//        sysStaffPostService.updateBySid(sysStaffPostDto, sysStaffPost.getSid());
         boolean isUpdate = updateById(sysStaffinfo);
-        if (!isUpdate) {
-            return rb.setMsg("更新员工信息失败");
-        }
+//        if (!isUpdate) {
+//            return rb.setMsg("更新员工信息失败");
+//        }
         List<SysStaffOrgVo> sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid);
         List<String> orgList1 = new ArrayList<>();
         if (sysStaffOrgVos1.size() > 0) {
@@ -940,12 +944,12 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
             }
         }
         List<String> reduce1 = orgList.stream().filter(item -> !orgList1.contains(item)).collect(toList());
-        if (reduce1.size() > 0) {
-            //根据staffSid查询token
-            String token = sysUserService.selectByStaffsid(sid).getToken();
-            //清空该token
-            redisUtil.remove(token);
-        }
+//        if (reduce1.size() > 0) {
+//            //根据staffSid查询token
+//            String token = sysUserService.selectByStaffsid(sid).getToken();
+//            //清空该token
+//            redisUtil.remove(token);
+//        }
         return rb.success().setMsg("更新员工信息成功");
     }
     /**
@@ -1025,7 +1029,12 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         }
         return count;
     }
+    public int delByIds(String sid) {
+        //更新员工的员工状态以及员工工号
+        int j = baseMapper.deleteBySid(sid);
 
+        return j;
+    }
     public ResultBean<List<PcSysStaffVo>> selectStaffList(PcSysStaffQuery pcSysStaffQuery) {
         ResultBean<List<PcSysStaffVo>> rb = ResultBean.fireFail();
         //根据当前staffSid查询分公司sid

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java

@@ -44,6 +44,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<SysUserVo> selectListVo();
 
     public int updatePassword(String sid, String password);
+    public int deleteBySid(String sid);
 
     public int updatePasswordApp(String sid, String password);
 

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml

@@ -5,59 +5,59 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.system.sysuser.SysUserVo">
         SELECT DISTINCT user.staffSid,
-                        user.isEnable,
-                        (
-                            SELECT GROUP_CONCAT(org.name)
-                            FROM sys_staff_org staffOrg
-                                     LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
-                            WHERE staffOrg.staffSid = user.staffSid
-                        )              departmentName,
-                        (
-                            SELECT GROUP_CONCAT(org.sid)
-                            FROM sys_staff_org staffOrg
-                                     LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
-                            WHERE staffOrg.staffSid = user.staffSid
-                        )              departmentSid,
-                        (
-                            SELECT GROUP_CONCAT(post.name)
-                            FROM sys_staff_post staffPost
-                                     LEFT JOIN sys_post post ON post.sid = staffPost.postSid
-                            WHERE staffPost.staffSid = user.staffSid
-                        )              postName,
-                        (
-                            SELECT GROUP_CONCAT(post.sid)
-                            FROM sys_staff_post staffPost
-                                     LEFT JOIN sys_post post ON post.sid = staffPost.postSid
-                            WHERE staffPost.staffSid = user.staffSid
-                        )              postSid,
-                        user.userName,
-                        user.sid       sid,
-                        staff.name,
-                        (
-                            SELECT GROUP_CONCAT(role.name)
-                            FROM sys_user_role user_role
-                                     LEFT JOIN sys_role role ON role.sid = user_role.roleSid
-                            WHERE user_role.userSid = USER.sid
-                        )              roleName,
-                        dict.dictValue userType,
-                        user.userType  userTypeKey
+        user.isEnable,
+        (
+        SELECT GROUP_CONCAT(org.name)
+        FROM sys_staff_org staffOrg
+        LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+        WHERE staffOrg.staffSid = user.staffSid
+        )              departmentName,
+        (
+        SELECT GROUP_CONCAT(org.sid)
+        FROM sys_staff_org staffOrg
+        LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+        WHERE staffOrg.staffSid = user.staffSid
+        )              departmentSid,
+        (
+        SELECT GROUP_CONCAT(post.name)
+        FROM sys_staff_post staffPost
+        LEFT JOIN sys_post post ON post.sid = staffPost.postSid
+        WHERE staffPost.staffSid = user.staffSid
+        )              postName,
+        (
+        SELECT GROUP_CONCAT(post.sid)
+        FROM sys_staff_post staffPost
+        LEFT JOIN sys_post post ON post.sid = staffPost.postSid
+        WHERE staffPost.staffSid = user.staffSid
+        )              postSid,
+        user.userName,
+        user.sid       sid,
+        staff.name,
+        (
+        SELECT GROUP_CONCAT(role.name)
+        FROM sys_user_role user_role
+        LEFT JOIN sys_role role ON role.sid = user_role.roleSid
+        WHERE user_role.userSid = USER.sid
+        )              roleName,
+        dict.dictValue userType,
+        user.userType  userTypeKey
         FROM sys_user USER
-                 LEFT JOIN sys_user_role user_role ON user_role.userSid = USER.sid
-                 LEFT JOIN sys_role role ON role.sid = user_role.roleSid
-                 LEFT JOIN dict_common dict ON dict.dictKey = user.userType AND dict.dictType = 'userType'
-                 LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid
+        LEFT JOIN sys_user_role user_role ON user_role.userSid = USER.sid
+        LEFT JOIN sys_role role ON role.sid = user_role.roleSid
+        LEFT JOIN dict_common dict ON dict.dictKey = user.userType AND dict.dictType = 'userType'
+        LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid
         <where>
             ${ew.sqlSegment}
             <if test="orgName != null and orgName != ''">
                 AND (SELECT GROUP_CONCAT(org.name)
-                     FROM sys_staff_org staffOrg
-                              LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
-                     WHERE staffOrg.staffSid = user.staffSid)
-                    LIKE concat('%',
-                    #{orgName}
-                    ,
-                    '%'
-                    )
+                FROM sys_staff_org staffOrg
+                LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+                WHERE staffOrg.staffSid = user.staffSid)
+                LIKE concat('%',
+                #{orgName}
+                ,
+                '%'
+                )
             </if>
             <if test="userName != null and userName != ''">
                 and
@@ -146,6 +146,10 @@
         set password=#{param2}
         where sid = #{param1}
     </update>
+    <delete id="deleteBySid">
+        delete from  sys_user
+        where sid = #{sid}
+    </delete>
     <update id="updatePasswordApp">
         update sys_user
         set password=#{param2}
@@ -203,7 +207,7 @@
                  LEFT JOIN sys_organization so ON sso.orgSid = so.sid
         WHERE su.sid = #{userSid}
         ORDER BY sso.id
-        LIMIT 1
+            LIMIT 1
     </select>
     <!--根据用户的sid查询用户的组织信息:多个时取第一个-->
     <select id="selectUserInfoByUserSid" resultType="com.yxt.supervise.system.sysuser.SysUserInfoVo">
@@ -214,7 +218,7 @@
                  LEFT JOIN sys_organization so ON sso.orgSid = so.sid
         WHERE su.sid = #{userSid}
         ORDER BY sso.id
-        LIMIT 1
+            LIMIT 1
     </select>
 
     <select id="selectUserInfoByUserSidOne" resultType="com.yxt.supervise.system.sysuser.SysUserInfoVo">
@@ -226,7 +230,7 @@
         WHERE su.sid = #{userSid}
           and find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ','))
         ORDER BY sso.id
-        LIMIT 1
+            LIMIT 1
     </select>
     <!--根据员工sid更新用户表的工号以及手机号-->
     <update id="updateByStaffSid">
@@ -271,12 +275,12 @@
     <select id="getUserByRole" resultType="com.yxt.supervise.system.sysuser.SysUserVo">
         select distinct si.name, su.sid, su.staffSid<!--, so.orgSidPath-->
         from sys_user_role sr
-                 left join sys_user su on sr.userSid = su.sid
-                 left join sys_staffinfo si on si.sid = su.staffSid
-                 left join sys_staff_org so on so.staffSid = si.sid
+        left join sys_user su on sr.userSid = su.sid
+        left join sys_staffinfo si on si.sid = su.staffSid
+        left join sys_staff_org so on so.staffSid = si.sid
         where sr.roleSid = #{roleSid}
-          and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
-          and si.personTypeKey != '01'
+        and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
+        and si.personTypeKey != '01'
     </select>
 
     <select id="getUserByOrgSid" resultType="java.util.Map">
@@ -302,7 +306,7 @@
     <select id="fetchBySids" resultType="com.yxt.supervise.system.sysuser.SysUserVo">
         select su.*, ss.name
         from sys_user su
-                 left join sys_staffinfo ss on su.staffSid = ss.sid
+        left join sys_staffinfo ss on su.staffSid = ss.sid
         where su.sid in
         <foreach collection="sids" index="index" item="item" open="(" separator="," close=")">
             #{item}
@@ -340,12 +344,12 @@
     <select id="getUserMessageByRole" resultType="com.yxt.supervise.system.sysuser.SysUserVo">
         select distinct si.name, su.sid, su.staffSid,so.orgSidPath
         from sys_user_role sr
-                 left join sys_user su on sr.userSid = su.sid
-                 left join sys_staffinfo si on si.sid = su.staffSid
-                 left join sys_staff_org so on so.staffSid = si.sid
+        left join sys_user su on sr.userSid = su.sid
+        left join sys_staffinfo si on si.sid = su.staffSid
+        left join sys_staff_org so on so.staffSid = si.sid
         where sr.roleSid = #{roleSid}
-          and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
-          and si.personTypeKey != '01' AND so.`manageType`=3 and su.sid in
+        and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
+        and si.personTypeKey != '01' AND so.`manageType`=3 and su.sid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>