10/8

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplate.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.crm.api.projecttemplate;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/27 15:43
+ */
+@Data
+@ApiModel(value = "模版消息发送的员工", description = "模版消息发送的员工")
+@TableName("project_template")
+public class ProjectTemplate {
+    private String id;
+    private String ids;
+    private String userProjectSid;//用户项目关联sid
+    private String templateSid;//微信模版消息sid
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplateDto.java

@@ -0,0 +1,18 @@
+package com.yxt.supervise.crm.api.projecttemplate;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/27 15:45
+ */
+@Data
+public class ProjectTemplateDto implements Dto {
+    private String id;
+    private String sid;
+    private String userProjectSid;//用户项目关联sid
+    private List<String> templateSid;//微信模版消息sid
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplateQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.supervise.crm.api.projecttemplate;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/27 15:46
+ */
+@Data
+public class ProjectTemplateQuery implements Query {
+    private String id;
+    private String ids;
+    private String userProjectSid;//用户项目关联sid
+    private String templateSid;//微信模版消息sid
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplateVo.java

@@ -0,0 +1,17 @@
+package com.yxt.supervise.crm.api.projecttemplate;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/27 15:46
+ */
+@Data
+public class ProjectTemplateVo implements Vo {
+    private String id;
+    private String ids;
+    private String userProjectSid;//用户项目关联sid
+    private String templateSid;//微信模版消息sid
+    private String userSid;
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessage.java

@@ -0,0 +1,18 @@
+package com.yxt.supervise.crm.api.templatemessage;
+
+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/9/27 15:43
+ */
+@Data
+@ApiModel(value = "模版消息", description = "模版消息")
+@TableName("template_message")
+public class TemplateMessage extends BaseEntity {
+    private String typeSid;
+    private String name;//
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessageDto.java

@@ -0,0 +1,18 @@
+package com.yxt.supervise.crm.api.templatemessage;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/27 15:45
+ */
+@Data
+public class TemplateMessageDto implements Dto {
+    private String id;
+    private String sid;
+    private String typeSid;
+    private String name;//
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessageQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.supervise.crm.api.templatemessage;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/27 15:46
+ */
+@Data
+public class TemplateMessageQuery implements Query {
+    private String typeSid;
+    private String name;//
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessageVo.java

@@ -0,0 +1,16 @@
+package com.yxt.supervise.crm.api.templatemessage;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/27 15:46
+ */
+@Data
+public class TemplateMessageVo implements Vo {
+    private String id;
+    private String ids;
+    private String typeSid;
+    private String name;//
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageType.java

@@ -0,0 +1,17 @@
+package com.yxt.supervise.crm.api.templatemessagetype;
+
+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/9/27 15:43
+ */
+@Data
+@ApiModel(value = "模版消息类型", description = "模版消息类型")
+@TableName("template_message_message")
+public class TemplateMessageType extends BaseEntity {
+    private String name;//
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageTypeDto.java

@@ -0,0 +1,16 @@
+package com.yxt.supervise.crm.api.templatemessagetype;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/27 15:45
+ */
+@Data
+public class TemplateMessageTypeDto implements Dto {
+    private String id;
+    private String sid;
+    private String typeSid;
+    private String name;//
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageTypeQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.supervise.crm.api.templatemessagetype;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/27 15:46
+ */
+@Data
+public class TemplateMessageTypeQuery implements Query {
+    private String typeSid;
+    private String name;//
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageTypeVo.java

@@ -0,0 +1,15 @@
+package com.yxt.supervise.crm.api.templatemessagetype;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/27 15:46
+ */
+@Data
+public class TemplateMessageTypeVo implements Vo {
+    private String id;
+    private String sid;
+    private String name;//
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/userproject/UserProjectVo.java

@@ -11,6 +11,34 @@ public class UserProjectVo implements Query {
     private String sid;
     private String projectSid;
     private String userSid;
+    private String name;
+    private String orgName;
+    //是否绑定openid;1 未绑定 2绑定
+    private String isOpenId;
+
+    public String getIsOpenId() {
+        return isOpenId;
+    }
+
+    public void setIsOpenId(String isOpenId) {
+        this.isOpenId = isOpenId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
 
     public String getId() {
         return id;

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateMapper.java

@@ -0,0 +1,34 @@
+package com.yxt.supervise.crm.biz.projecttemplate;
+
+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.crm.api.projecttemplate.ProjectTemplate;
+import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 17:09
+ */
+@Mapper
+public interface ProjectTemplateMapper extends BaseMapper<ProjectTemplate> {
+    IPage<ProjectTemplateVo> selectPageVo(IPage<ProjectTemplate> page, @Param(Constants.WRAPPER) Wrapper<ProjectTemplate> qw);
+    @Select("select * from project_information")
+    List<ProjectTemplateVo> listAll();
+    List<ProjectTemplateVo> getProjectBySid( @Param("sid") String sid);
+    @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid left join user_project u on u.projectSid =p.sid where u.userSid=#{sid}")
+    List<ProjectTemplateVo> getProjectByUserSid( @Param("sid") String sid);
+    @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid where p.bankSid=#{sid}")
+    List<ProjectTemplateVo> getProjectByBankSid( @Param("sid") String sid);
+    @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid")
+    List<ProjectTemplateVo> getProjectByUser( @Param("sid") String sid);
+    void insertFiles(List<Map<String, String>> maps);
+    List<ProjectTemplateVo> getProjectListByUserSid(@Param("userSid") String userSid);
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateMapper.xml

@@ -0,0 +1,51 @@
+<?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.crm.biz.projecttemplate.ProjectTemplateMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateVo">
+        SELECT
+        info.entryName,
+        id.industryName,
+        td.projectType as typeName,
+        info.creditLimit,
+        bank.bankName,
+        bm.name as  bManagerName,
+        info.signingDate,
+        info.endDate,
+        ei.enterpriseName,
+        ei.contacts as eContacts,
+        info.regulatoryLeader,info.*
+        FROM
+        project_information info
+        LEFT JOIN project_type_dictionary td on td.sid=info.typeSid
+        left join industry_dictionary id on id.sid =info .industrySid
+        left join loan_bank_information bank on bank.sid=info.bankSid
+        left join bank_manager bm on bm.sid =info.managerSid
+        LEFT JOIN enterprise_information ei on ei.sid=info.enterpriseSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="getProjectBySid" resultType="com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateVo">
+        SELECT t.*,u.userSid
+        FROM
+            project_template t
+        left join  user_project u on u.sid= t.userProjectSid
+        WHERE userProjectSid=#{sid}
+    </select>
+    <insert id="insertFiles">
+        insert into  project_files (sid, url, mainSid) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            #{item.sid,jdbcType=VARCHAR},
+            #{item.url,jdbcType=VARCHAR},
+            #{item.mainSid,jdbcType=VARCHAR}
+            )
+        </foreach>
+    </insert>
+
+    <select id="getProjectListByUserSid" resultType="com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateVo">
+        select p.sid,p.entryName from user_project u right join project_information p on u.projectSid = p.sid where userSid = #{userSid}
+    </select>
+</mapper>

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateRest.java

@@ -0,0 +1,57 @@
+package com.yxt.supervise.crm.biz.projecttemplate;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.crm.api.projecttemplate.ProjectTemplateDto;
+import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateQuery;
+import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 17:10
+ */
+@Api(tags = "模版消息发送的员工")
+@RestController
+@RequestMapping("v1/ProjectTemplate")
+public class ProjectTemplateRest {
+    @Autowired
+    ProjectTemplateService ProjectTemplateService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<ProjectTemplateVo>> listPage(@RequestBody PagerQuery<ProjectTemplateQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ProjectTemplateVo> pv = ProjectTemplateService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody ProjectTemplateDto dto) {
+        return ProjectTemplateService.save(dto);
+    }
+
+    @ApiOperation("修改")
+    @PostMapping("/update")
+    public ResultBean update(@RequestBody ProjectTemplateDto dto) {
+        return ProjectTemplateService.update(dto);
+    }
+
+    @ApiOperation("根据sid查询企业信息")
+    @GetMapping("/getEnterpriseBySid/{sid}")
+    public ResultBean getEnterpriseBySid(@PathVariable String sid){
+        ResultBean rb = ResultBean.fireFail();
+        List<ProjectTemplateVo> ProjectTemplateVo=ProjectTemplateService.getByUserProjectSid(sid);
+        return rb.success().setData(ProjectTemplateVo);
+    }
+
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateService.java

@@ -0,0 +1,84 @@
+package com.yxt.supervise.crm.biz.projecttemplate;
+
+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.base.utils.StringUtils;
+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.crm.api.bankmanager.BankManager;
+import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo;
+import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplate;
+import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateDto;
+import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateQuery;
+import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateVo;
+import com.yxt.supervise.crm.api.userproject.UserProject;
+import com.yxt.supervise.crm.biz.bankmanager.BankManagerService;
+import com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectService;
+import com.yxt.supervise.crm.biz.loanbankinformation.LoanBankInformationService;
+import com.yxt.supervise.crm.biz.projecttypedictionary.ProjectTypeDictionaryService;
+import com.yxt.supervise.crm.biz.storehouseproject.StoreHouseProjectService;
+import com.yxt.supervise.crm.biz.userproject.UserProjectService;
+import com.yxt.supervise.system.sysuser.SysUser;
+import com.yxt.supervise.system.sysuser.SysUserVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/27 15:45
+ */
+@Service
+public class ProjectTemplateService extends MybatisBaseService<ProjectTemplateMapper, ProjectTemplate> {
+
+    public PagerVo<ProjectTemplateVo> listPageVo(PagerQuery<ProjectTemplateQuery> pq) {
+        ProjectTemplateQuery query = pq.getParams();
+        QueryWrapper<ProjectTemplate> qw = new QueryWrapper<>();
+//        if(StringUtils.isNotBlank(query.getEntryName())){
+//            qw.like("info.entryName",query.getEntryName());
+//        }
+//        if(StringUtils.isNotBlank(query.getProjectType())){
+//            qw.like("td.projectType",query.getProjectType());
+//        }
+//        if(StringUtils.isNotBlank(query.getBankName())){
+//            qw.like("bank.bankName",query.getBankName());
+//        }
+        IPage<ProjectTemplate> page = PagerUtil.queryToPage(pq);
+        IPage<ProjectTemplateVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ProjectTemplateVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<ProjectTemplateVo> listAll() {
+        List<ProjectTemplateVo> pagging = baseMapper.listAll();
+        return pagging;
+    }
+    @Transactional
+    public ResultBean save(ProjectTemplateDto dto) {
+        ResultBean rb=new ResultBean();
+        ProjectTemplate entity=new ProjectTemplate();
+        for(String template:dto.getTemplateSid()){
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            entity.setTemplateSid(template);
+            baseMapper.insert(entity);
+        }
+        return rb.success().setMsg("保存成功");
+    }
+    @Transactional
+    public ResultBean update(ProjectTemplateDto dto) {
+        ResultBean rb=new ResultBean();
+        baseMapper.delete(new QueryWrapper<ProjectTemplate>().eq("userProjectSid",dto.getUserProjectSid()));
+        save(dto);
+        return rb.success().setMsg("修改项目信息成功");
+    }
+    public List<ProjectTemplateVo> getByUserProjectSid(String userProjectSid){
+        List<ProjectTemplateVo> projects=baseMapper.getProjectBySid(userProjectSid);
+        return projects;
+    }
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageMapper.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.crm.biz.templatemessage;
+
+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.crm.api.templatemessage.TemplateMessage;
+import com.yxt.supervise.crm.api.templatemessage.TemplateMessageVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 17:09
+ */
+@Mapper
+public interface TemplateMessageMapper extends BaseMapper<TemplateMessage> {
+    IPage<TemplateMessageVo> selectPageVo(IPage<TemplateMessage> page, @Param(Constants.WRAPPER) Wrapper<TemplateMessage> qw);
+
+    @Select("select * from template_message where typeSid =#{typeSid}")
+    List<TemplateMessageVo> listAll(@Param("typeSid")String typeSid);
+
+    List<TemplateMessageVo> getProjectBySid( @Param("sid") String sid);
+
+    void insertFiles(List<Map<String, String>> maps);
+
+    List<TemplateMessageVo> getProjectListByUserSid(@Param("userSid") String userSid);
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageMapper.xml

@@ -0,0 +1,51 @@
+<?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.crm.biz.templatemessage.TemplateMessageMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.crm.api.templatemessage.TemplateMessageVo">
+        SELECT
+        info.entryName,
+        id.industryName,
+        td.projectType as typeName,
+        info.creditLimit,
+        bank.bankName,
+        bm.name as  bManagerName,
+        info.signingDate,
+        info.endDate,
+        ei.enterpriseName,
+        ei.contacts as eContacts,
+        info.regulatoryLeader,info.*
+        FROM
+        project_information info
+        LEFT JOIN project_type_dictionary td on td.sid=info.typeSid
+        left join industry_dictionary id on id.sid =info .industrySid
+        left join loan_bank_information bank on bank.sid=info.bankSid
+        left join bank_manager bm on bm.sid =info.managerSid
+        LEFT JOIN enterprise_information ei on ei.sid=info.enterpriseSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="getProjectBySid" resultType="com.yxt.supervise.crm.api.templatemessage.TemplateMessageVo">
+        SELECT t.*,u.userSid
+        FROM
+            project_template t
+        left join  user_project u on u.sid= t.userProjectSid
+        WHERE userProjectSid=#{sid}
+    </select>
+    <insert id="insertFiles">
+        insert into  project_files (sid, url, mainSid) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            #{item.sid,jdbcType=VARCHAR},
+            #{item.url,jdbcType=VARCHAR},
+            #{item.mainSid,jdbcType=VARCHAR}
+            )
+        </foreach>
+    </insert>
+
+    <select id="getProjectListByUserSid" resultType="com.yxt.supervise.crm.api.templatemessage.TemplateMessageVo">
+        select p.sid,p.entryName from user_project u right join project_information p on u.projectSid = p.sid where userSid = #{userSid}
+    </select>
+</mapper>

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageRest.java

@@ -0,0 +1,64 @@
+package com.yxt.supervise.crm.biz.templatemessage;
+
+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.crm.api.templatemessage.TemplateMessageDto;
+import com.yxt.supervise.crm.api.templatemessage.TemplateMessageQuery;
+import com.yxt.supervise.crm.api.templatemessage.TemplateMessageVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 17:10
+ */
+@Api(tags = "模版消息发送的员工")
+@RestController
+@RequestMapping("v1/TemplateMessage")
+public class TemplateMessageRest {
+    @Autowired
+    TemplateMessageService TemplateMessageService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<TemplateMessageVo>> listPage(@RequestBody PagerQuery<TemplateMessageQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<TemplateMessageVo> pv = TemplateMessageService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @PostMapping("/listAll")
+    public ResultBean listPage() {
+        ResultBean rb = ResultBean.fireFail();
+        Map<String,Object> pv = TemplateMessageService.listAll();
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody TemplateMessageDto dto) {
+        return TemplateMessageService.save(dto);
+    }
+
+    @ApiOperation("修改")
+    @PostMapping("/update")
+    public ResultBean update(@RequestBody TemplateMessageDto dto) {
+        return TemplateMessageService.update(dto);
+    }
+
+    @ApiOperation("根据sid查询企业信息")
+    @GetMapping("/getEnterpriseBySid/{sid}")
+    public ResultBean getEnterpriseBySid(@PathVariable String sid){
+        ResultBean rb = ResultBean.fireFail();
+        List<TemplateMessageVo> TemplateMessageVo=TemplateMessageService.getByUserProjectSid(sid);
+        return rb.success().setData(TemplateMessageVo);
+    }
+
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageService.java

@@ -0,0 +1,88 @@
+package com.yxt.supervise.crm.biz.templatemessage;
+
+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.crm.api.enterpriseinformation.EnterpriseInformation;
+import com.yxt.supervise.crm.api.templatemessage.TemplateMessage;
+import com.yxt.supervise.crm.api.templatemessage.TemplateMessageDto;
+import com.yxt.supervise.crm.api.templatemessage.TemplateMessageQuery;
+import com.yxt.supervise.crm.api.templatemessage.TemplateMessageVo;
+import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageType;
+import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeVo;
+import com.yxt.supervise.crm.biz.templatemessagetype.TemplateMessageTypeRest;
+import com.yxt.supervise.crm.biz.templatemessagetype.TemplateMessageTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/27 15:45
+ */
+@Service
+public class TemplateMessageService extends MybatisBaseService<TemplateMessageMapper, TemplateMessage> {
+    @Autowired
+    TemplateMessageTypeService templateMessageTypeService;
+    public PagerVo<TemplateMessageVo> listPageVo(PagerQuery<TemplateMessageQuery> pq) {
+        TemplateMessageQuery query = pq.getParams();
+        QueryWrapper<TemplateMessage> qw = new QueryWrapper<>();
+//        if(StringUtils.isNotBlank(query.getEntryName())){
+//            qw.like("info.entryName",query.getEntryName());
+//        }
+//        if(StringUtils.isNotBlank(query.getProjectType())){
+//            qw.like("td.projectType",query.getProjectType());
+//        }
+//        if(StringUtils.isNotBlank(query.getBankName())){
+//            qw.like("bank.bankName",query.getBankName());
+//        }
+        IPage<TemplateMessage> page = PagerUtil.queryToPage(pq);
+        IPage<TemplateMessageVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<TemplateMessageVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public Map<String,Object> listAll() {
+        Map<String,Object>map=new HashMap<>();
+        List<TemplateMessageTypeVo>list=templateMessageTypeService.listAll();
+        for(TemplateMessageTypeVo templateMessageTypeVo:list){
+            List<TemplateMessageVo> pagging = baseMapper.listAll(templateMessageTypeVo.getSid());
+            map.put(templateMessageTypeVo.getName(),pagging);
+        }
+
+        return map;
+    }
+    @Transactional
+    public ResultBean save(TemplateMessageDto dto) {
+        ResultBean rb=new ResultBean();
+        TemplateMessage entity=new TemplateMessage();
+//        for(String template:dto.getTemplateSid()){
+//            BeanUtil.copyProperties(dto, entity, "id", "sid");
+//            entity.setTemplateSid(template);
+//            baseMapper.insert(entity);
+//        }
+        return rb.success().setMsg("保存成功");
+    }
+    @Transactional
+    public ResultBean update(TemplateMessageDto dto) {
+        ResultBean rb=new ResultBean();
+        String dtoSid = dto.getSid();
+        TemplateMessage entity=fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+        return rb.success().setMsg("修改项目信息成功");
+    }
+    public List<TemplateMessageVo> getByUserProjectSid(String userProjectSid){
+        List<TemplateMessageVo> projects=baseMapper.getProjectBySid(userProjectSid);
+        return projects;
+    }
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeMapper.java

@@ -0,0 +1,34 @@
+package com.yxt.supervise.crm.biz.templatemessagetype;
+
+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.crm.api.templatemessagetype.TemplateMessageType;
+import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 17:09
+ */
+@Mapper
+public interface TemplateMessageTypeMapper extends BaseMapper<TemplateMessageType> {
+    IPage<TemplateMessageTypeVo> selectPageVo(IPage<TemplateMessageType> page, @Param(Constants.WRAPPER) Wrapper<TemplateMessageType> qw);
+    @Select("select * from project_information")
+    List<TemplateMessageTypeVo> listAll();
+    List<TemplateMessageTypeVo> getProjectBySid( @Param("sid") String sid);
+    @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid left join user_project u on u.projectSid =p.sid where u.userSid=#{sid}")
+    List<TemplateMessageTypeVo> getProjectByUserSid( @Param("sid") String sid);
+    @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid where p.bankSid=#{sid}")
+    List<TemplateMessageTypeVo> getProjectByBankSid( @Param("sid") String sid);
+    @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid")
+    List<TemplateMessageTypeVo> getProjectByUser( @Param("sid") String sid);
+    void insertFiles(List<Map<String, String>> maps);
+    List<TemplateMessageTypeVo> getProjectListByUserSid(@Param("userSid") String userSid);
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeMapper.xml

@@ -0,0 +1,51 @@
+<?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.crm.biz.templatemessagetype.TemplateMessageTypeMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeVo">
+        SELECT
+        info.entryName,
+        id.industryName,
+        td.projectType as typeName,
+        info.creditLimit,
+        bank.bankName,
+        bm.name as  bManagerName,
+        info.signingDate,
+        info.endDate,
+        ei.enterpriseName,
+        ei.contacts as eContacts,
+        info.regulatoryLeader,info.*
+        FROM
+        project_information info
+        LEFT JOIN project_type_dictionary td on td.sid=info.typeSid
+        left join industry_dictionary id on id.sid =info .industrySid
+        left join loan_bank_information bank on bank.sid=info.bankSid
+        left join bank_manager bm on bm.sid =info.managerSid
+        LEFT JOIN enterprise_information ei on ei.sid=info.enterpriseSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="getProjectBySid" resultType="com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeVo">
+        SELECT t.*,u.userSid
+        FROM
+            project_template t
+        left join  user_project u on u.sid= t.userProjectSid
+        WHERE userProjectSid=#{sid}
+    </select>
+    <insert id="insertFiles">
+        insert into  project_files (sid, url, mainSid) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            #{item.sid,jdbcType=VARCHAR},
+            #{item.url,jdbcType=VARCHAR},
+            #{item.mainSid,jdbcType=VARCHAR}
+            )
+        </foreach>
+    </insert>
+
+    <select id="getProjectListByUserSid" resultType="com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeVo">
+        select p.sid,p.entryName from user_project u right join project_information p on u.projectSid = p.sid where userSid = #{userSid}
+    </select>
+</mapper>

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeRest.java

@@ -0,0 +1,61 @@
+package com.yxt.supervise.crm.biz.templatemessagetype;
+
+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.crm.api.templatemessage.TemplateMessageVo;
+import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeDto;
+import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeQuery;
+import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 17:10
+ */
+@Api(tags = "模版消息发送的员工")
+@RestController
+@RequestMapping("v1/TemplateMessageType")
+public class TemplateMessageTypeRest {
+    @Autowired
+    TemplateMessageTypeService TemplateMessageTypeService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<TemplateMessageTypeVo>> listPage(@RequestBody PagerQuery<TemplateMessageTypeQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<TemplateMessageTypeVo> pv = TemplateMessageTypeService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @PostMapping("/listAll")
+    public ResultBean<TemplateMessageVo> listPage() {
+        ResultBean rb = ResultBean.fireFail();
+        List<TemplateMessageTypeVo> pv = TemplateMessageTypeService.listAll();
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody TemplateMessageTypeDto dto) {
+        return TemplateMessageTypeService.save(dto);
+    }
+
+    @ApiOperation("修改")
+    @PostMapping("/update")
+    public ResultBean update(@RequestBody TemplateMessageTypeDto dto) {
+        return TemplateMessageTypeService.update(dto);
+    }
+
+    @ApiOperation("根据sid查询企业信息")
+    @GetMapping("/getEnterpriseBySid/{sid}")
+    public ResultBean getEnterpriseBySid(@PathVariable String sid){
+        ResultBean rb = ResultBean.fireFail();
+        List<TemplateMessageTypeVo> TemplateMessageTypeVo=TemplateMessageTypeService.getByUserProjectSid(sid);
+        return rb.success().setData(TemplateMessageTypeVo);
+    }
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeService.java

@@ -0,0 +1,74 @@
+package com.yxt.supervise.crm.biz.templatemessagetype;
+
+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.crm.api.templatemessage.TemplateMessage;
+import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageType;
+import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeDto;
+import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeQuery;
+import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeVo;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/27 15:45
+ */
+@Service
+public class TemplateMessageTypeService extends MybatisBaseService<TemplateMessageTypeMapper, TemplateMessageType> {
+
+    public PagerVo<TemplateMessageTypeVo> listPageVo(PagerQuery<TemplateMessageTypeQuery> pq) {
+        TemplateMessageTypeQuery query = pq.getParams();
+        QueryWrapper<TemplateMessageType> qw = new QueryWrapper<>();
+//        if(StringUtils.isNotBlank(query.getEntryName())){
+//            qw.like("info.entryName",query.getEntryName());
+//        }
+//        if(StringUtils.isNotBlank(query.getProjectType())){
+//            qw.like("td.projectType",query.getProjectType());
+//        }
+//        if(StringUtils.isNotBlank(query.getBankName())){
+//            qw.like("bank.bankName",query.getBankName());
+//        }
+        IPage<TemplateMessageType> page = PagerUtil.queryToPage(pq);
+        IPage<TemplateMessageTypeVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<TemplateMessageTypeVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<TemplateMessageTypeVo> listAll() {
+        List<TemplateMessageTypeVo> pagging = baseMapper.listAll();
+        return pagging;
+    }
+    @Transactional
+    public ResultBean save(TemplateMessageTypeDto dto) {
+        ResultBean rb=new ResultBean();
+        TemplateMessageType entity=new TemplateMessageType();
+//        for(String template:dto.getTemplateSid()){
+//            BeanUtil.copyProperties(dto, entity, "id", "sid");
+//            entity.setTemplateSid(template);
+//            baseMapper.insert(entity);
+//        }
+        return rb.success().setMsg("保存成功");
+    }
+    @Transactional
+    public ResultBean update(TemplateMessageTypeDto dto) {
+        ResultBean rb=new ResultBean();
+        String dtoSid = dto.getSid();
+        TemplateMessageType entity=fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+        return rb.success().setMsg("修改项目信息成功");
+    }
+    public List<TemplateMessageTypeVo> getByUserProjectSid(String userProjectSid){
+        List<TemplateMessageTypeVo> projects=baseMapper.getProjectBySid(userProjectSid);
+        return projects;
+    }
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
 public interface UserProjectMapper extends BaseMapper<UserProject> {
     IPage<UserProjectVo> selectPageVo(IPage<UserProject> page, @Param(Constants.WRAPPER) Wrapper<UserProject> qw);
     List<UserProjectVo> userProjectList();
-    List<UserProjectVo> getUserProjectBySid( @Param("projectSid") String projectSid,@Param("userType")String userType);
+    List<UserProjectVo> getUserProjectBySid( @Param("projectSid") String projectSid);
     List<String> getUsersByprojectSid( @Param("projectSid") String projectSid);
 
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.xml

@@ -17,7 +17,7 @@
         FROM user_project
     </select>
     <select id="getUserProjectBySid" resultType="com.yxt.supervise.crm.api.userproject.UserProjectVo">
-        SELECT * FROM user_project WHERE projectSid=#{projectSid} and userType=#{userType}
+        SELECT * FROM user_project WHERE projectSid=#{projectSid}
     </select>
     <select id="getUsersByprojectSid" resultType="com.yxt.supervise.crm.api.userproject.UserProjectVo">
         SELECT userSid FROM user_project WHERE projectSid=#{projectSid}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java

@@ -8,6 +8,9 @@ import com.yxt.supervise.crm.api.userproject.UserProjectDto;
 import com.yxt.supervise.crm.api.userproject.UserProjectQuery;
 import com.yxt.supervise.crm.api.userproject.UserProjectVo;
 import com.yxt.supervise.crm.biz.projectinformation.ProjectInformationService;
+import com.yxt.supervise.crm.feign.system.SysOrganizationFeign;
+import com.yxt.supervise.crm.feign.system.SysUserFeign;
+import com.yxt.supervise.system.sysorganization.SysOrganizationVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +31,8 @@ public class UserProjectRest {
     UserProjectService UserProjectService;
     @Autowired
     ProjectInformationService ProjectInformationService;
+    @Autowired
+    SysOrganizationFeign sysOrganizationFeign;
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
@@ -81,5 +86,10 @@ public class UserProjectRest {
         ResultBean rb = ResultBean.fireFail();
         return UserProjectService.getUsersByprojectSid(projectSid);
     }
-
+    @ApiOperation("查询组织结构下人员信息")
+    @GetMapping("/userList")
+    public ResultBean<List<SysOrganizationVo>> userList(){
+        ResultBean rb = ResultBean.fireFail();
+        return sysOrganizationFeign.userList();
+    }
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java

@@ -1,6 +1,7 @@
 package com.yxt.supervise.crm.biz.userproject;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -13,6 +14,9 @@ import com.yxt.supervise.crm.api.userproject.UserProject;
 import com.yxt.supervise.crm.api.userproject.UserProjectDto;
 import com.yxt.supervise.crm.api.userproject.UserProjectQuery;
 import com.yxt.supervise.crm.api.userproject.UserProjectVo;
+import com.yxt.supervise.crm.feign.system.SysUserFeign;
+import com.yxt.supervise.system.sysuser.SysUserVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -26,6 +30,8 @@ import java.util.UUID;
  */
 @Service
 public class UserProjectService extends MybatisBaseService<UserProjectMapper, UserProject> {
+    @Autowired
+    SysUserFeign sysUserFeign;
     public PagerVo<UserProjectVo> listPageVo(PagerQuery<UserProjectQuery> pq) {
         UserProjectQuery query = pq.getParams();
         QueryWrapper<UserProject> qw = new QueryWrapper<>();
@@ -46,14 +52,14 @@ public class UserProjectService extends MybatisBaseService<UserProjectMapper, Us
         //先删除项目
         baseMapper.delete(new QueryWrapper<UserProject>().eq("projectSid",dto.getProjectSid()));
         //银行人员
-        for(String bankUser:dto.getBankUsers()){
+//        for(String bankUser:dto.getBankUsers()){
-            UserProject entity=new UserProject();
+//            UserProject entity=new UserProject();
-            BeanUtil.copyProperties(dto, entity, "id", "sid");
+//            BeanUtil.copyProperties(dto, entity, "id", "sid");
-            entity.setSid(UUID.randomUUID().toString());
+//            entity.setSid(UUID.randomUUID().toString());
-            entity.setUserSid(bankUser);
+//            entity.setUserSid(bankUser);
-            entity.setUserType("3");
+//            entity.setUserType("3");
-            baseMapper.insert(entity);
+//            baseMapper.insert(entity);
-        }
+//        }
         //监管人员
         for(String user:dto.getUsers()){
             UserProject entity=new UserProject();
@@ -77,13 +83,19 @@ public class UserProjectService extends MybatisBaseService<UserProjectMapper, Us
     public ResultBean getUserProjectBySid(String projectSid){
         ResultBean rb=new ResultBean();
         Map<String,Object> map =new HashMap<>();
-        //银行人员
+        List<UserProjectVo> banks=baseMapper.getUserProjectBySid(projectSid);
-        List<UserProjectVo> banks=baseMapper.getUserProjectBySid(projectSid,"3");
+        for(UserProjectVo userProjectVo:banks){
-        //监管人员
+           List<SysUserVo>list= sysUserFeign.getUserOrgBySid(userProjectVo.getUserSid()).getData();
-        List<UserProjectVo> users=baseMapper.getUserProjectBySid(projectSid,"1");
+           if(list.size()>0){
-        map.put("bankUsers",banks);
+               userProjectVo.setOrgName(list.get(0).getOrganizationName());
-        map.put("users",users);
+               if(StrUtil.isNotEmpty(list.get(0).getOpenid())){
-        return rb.success().setData(map);
+                   userProjectVo.setIsOpenId("2");
+               }else{
+                   userProjectVo.setIsOpenId("1");
+               }
+           }
+        }
+        return rb.success().setData(banks);
     }
     public ResultBean<List<String>> getUsersByprojectSid(String projectSid){
         ResultBean rb=new ResultBean();

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/system/SysOrganizationFeign.java

@@ -0,0 +1,23 @@
+package com.yxt.supervise.crm.feign.system;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.system.sysorganization.SysOrganizationVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/10/7 15:31
+ */
+@FeignClient(
+        contextId = "supervise-system-sysorganization",
+        name = "supervise-system",
+        path = "v1/sysorganization")
+public interface SysOrganizationFeign {
+    @ApiOperation("获取组织结构下人员信息")
+    @GetMapping("/userList")
+    public ResultBean<List<SysOrganizationVo>> userList();
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/system/SysUserFeign.java

@@ -33,4 +33,6 @@ public interface SysUserFeign {
     public ResultBean<SysUser> getUserBySid(@RequestParam("sid")String sid);
     @GetMapping("getUserByType")
     public ResultBean<List<SysUserVo>> getUserByType(@RequestParam("userType") String userType);
+    @GetMapping("getUserOrgBySid")
+    public ResultBean<List<SysUserVo>> getUserOrgBySid(@RequestParam("sid") String sid);
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java

@@ -30,4 +30,9 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
     List<StoreHouse> listStoreHouseByProjectSid(@Param("projectSid") String projectSid);
     @Select("select * from project_information where sid = #{sid}")
     ProjectInfo getProjectNameBySid(@Param("sid") String sid);
+    @Select("select * from user_project where projectSid = #{sid}")
+    List<UserProject> getAllByProjectSid(@Param("sid") String sid);
+
+    @Select("select count(*) from project_template where userProjectSid = #{userProjectSid} and templateSid=#{templateSid}")
+    int countByUserProjectSid(@Param("userProjectSid") String userProjectSid,@Param("templateSid") String templateSid);
 }

yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationVo.java

@@ -2,6 +2,9 @@ package com.yxt.supervise.system.sysorganization;
 
 
 import com.yxt.common.core.vo.Vo;
+import com.yxt.supervise.system.sysstaffinfo.SysStaffinfo;
+import com.yxt.supervise.system.sysstaffinfo.SysStaffinfoVo;
+import com.yxt.supervise.system.sysuser.SysUserVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -83,4 +86,5 @@ public class SysOrganizationVo implements Vo {
     private String orgLevelValue;
     @ApiModelProperty("其他编码")
     private String otherCode;
+    private String mobile;
 }

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

@@ -112,7 +112,7 @@ public interface SysUserFeign {
      */
     @ApiOperation("客户端找回密码")
     @PostMapping("/reGetPwd")
-    public ResultBean reGetPwd(@RequestParam("userName") String userName, @RequestParam("userPhone") String userPhone);
+    public ResultBean reGetPwd(@RequestParam("userName") String userName, @RequestParam("userPhone") String userPhone,@RequestParam("verificationCode")String verificationCode);
 
     /**
      * 初始化密码

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

@@ -104,7 +104,7 @@ public class SysUserFeignFallback implements SysUserFeign {
 	}
 
 	@Override
-	public ResultBean reGetPwd(String userName, String userPhone) {
+	public ResultBean reGetPwd(String userName, String userPhone,String verificationCode) {
 		return null;
 	}
 

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/device/DeviceRest.java

@@ -1,25 +1,25 @@
-package com.yxt.supervise.system.device;
+//package com.yxt.supervise.system.device;
-
+//
-import com.alibaba.nacos.common.model.RestResult;
+//import com.alibaba.nacos.common.model.RestResult;
-import com.yxt.common.core.result.ResultBean;
+//import com.yxt.common.core.result.ResultBean;
-import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+//import org.springframework.web.bind.annotation.RestController;
-
+//
-/**
+///**
- * @author wangpengfei
+// * @author wangpengfei
- * @date 2023/9/9 10:30
+// * @date 2023/9/9 10:30
- */
+// */
-@RestController
+//@RestController
-@RequestMapping("/device")
+//@RequestMapping("/device")
-public class DeviceRest {
+//public class DeviceRest {
-    @Autowired
+//    @Autowired
-    private DeviceService deviceService;
+//    private DeviceService deviceService;
-    @GetMapping("/token")
+//    @GetMapping("/token")
-    public ResultBean token (){
+//    public ResultBean token (){
-        ResultBean rb=new ResultBean();
+//        ResultBean rb=new ResultBean();
-        String token=deviceService.spToken();
+//        String token=deviceService.spToken();
-        return rb.success().setData(token);
+//        return rb.success().setData(token);
-    }
+//    }
-}
+//}

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/device/DeviceService.java

@@ -1,57 +1,57 @@
-package com.yxt.supervise.system.device;
+//package com.yxt.supervise.system.device;
-
+//
-import com.alibaba.fastjson.JSONArray;
+//import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+//import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yxt.common.base.utils.HttpUtils;
+//import com.yxt.common.base.utils.HttpUtils;
-import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
+//import org.springframework.stereotype.Service;
-
+//
-import java.io.IOException;
+//import java.io.IOException;
-import java.security.KeyManagementException;
+//import java.security.KeyManagementException;
-import java.security.KeyStoreException;
+//import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
+//import java.security.NoSuchAlgorithmException;
-import java.util.HashMap;
+//import java.util.HashMap;
-import java.util.List;
+//import java.util.List;
-import java.util.Map;
+//import java.util.Map;
-
+//
-/**
+///**
- * @author wangpengfei
+// * @author wangpengfei
- * @date 2023/9/9 10:30
+// * @date 2023/9/9 10:30
- */
+// */
-@Service
+//@Service
-public class DeviceService {
+//public class DeviceService {
-    @Value("${haiKangConsumer.clientId}")
+////    @Value("${haiKangConsumer.clientId}")
-    private String clientId;
+////    private String clientId;
-
+////
-    @Value("${haiKangConsumer.clientSecret}")
+////    @Value("${haiKangConsumer.clientSecret}")
-    private String clientSecret;
+////    private String clientSecret;
-    public static String haiKangToken = "";
+//    public static String haiKangToken = "";
-    public static String haiKangMessageConsumer = "";
+//    public static String haiKangMessageConsumer = "";
-    public void initMain() {
+//    public void initMain() {
-        // 先登录
+//        // 先登录
-        String loginUrl = "https://api2.hik-cloud.com/oauth/token";
+//        String loginUrl = "https://api2.hik-cloud.com/oauth/token";
-        Map<String, Object> tokenParam = new HashMap<>();
+//        Map<String, Object> tokenParam = new HashMap<>();
-        tokenParam.put("client_id", clientId); // 客户端ID	String
+//        tokenParam.put("client_id", clientId); // 客户端ID	String
-        tokenParam.put("client_secret", clientSecret); //访问密钥	String
+//        tokenParam.put("client_secret", clientSecret); //访问密钥	String
-        tokenParam.put("grant_type", "client_credentials"); //认证模式	String 目前仅支持client_credentials
+//        tokenParam.put("grant_type", "client_credentials"); //认证模式	String 目前仅支持client_credentials
-        String tokenResult = HttpUtils.sendPostMap(loginUrl, tokenParam, "");
+//        String tokenResult = HttpUtils.sendPostMap(loginUrl, tokenParam, "");
-        JSONObject tokenObject = JSONObject.parseObject(tokenResult);
+//        JSONObject tokenObject = JSONObject.parseObject(tokenResult);
-        haiKangToken = tokenObject.get("access_token").toString();
+//        haiKangToken = tokenObject.get("access_token").toString();
-    }
+//    }
-    public String spToken(){
+//    public String spToken(){
-        initMain();
+//        initMain();
-        String lUrl = "https://api2.hik-cloud.com/v1/ezviz/account/info";
+//        String lUrl = "https://api2.hik-cloud.com/v1/ezviz/account/info";
-        String qlToken="";
+//        String qlToken="";
-        try {
+//        try {
-            String result=HttpUtils.sendGet(lUrl,haiKangToken);
+//            String result=HttpUtils.sendGet(lUrl,haiKangToken);
-            JSONObject jsonObject = JSONObject.parseObject(result);
+//            JSONObject jsonObject = JSONObject.parseObject(result);
-            JSONObject dataJson = (JSONObject) jsonObject.get("data");
+//            JSONObject dataJson = (JSONObject) jsonObject.get("data");
-            String appKey = dataJson.get("appKey").toString();
+//            String appKey = dataJson.get("appKey").toString();
-            qlToken = dataJson.get("token").toString();
+//            qlToken = dataJson.get("token").toString();
-        } catch (Exception e) {
+//        } catch (Exception e) {
-            throw new RuntimeException(e);
+//            throw new RuntimeException(e);
-        }
+//        }
-        return qlToken;
+//        return qlToken;
-    }
+//    }
-}
+//}

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.java

@@ -5,6 +5,7 @@ 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.system.sysstafforg.SysStaffOrgVo;
+import com.yxt.supervise.system.sysuser.SysUserVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -76,7 +77,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     SysOrganization selectByOrgCode(String substring);
 
     List<SysOrganizationVo> selectChildernList(String sid);
-
+    List<SysOrganizationVo> selectUserList(String sid);
     /**
      * 根据业务员sid获取到分公司
      *

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.xml

@@ -130,6 +130,13 @@
         WHERE psid = #{psid}
         ORDER BY so.sort ASC
     </select>
+    <select id="selectUserList" resultType="com.yxt.supervise.system.sysorganization.SysOrganizationVo">
+        SELECT user.*,staff.name as name
+        FROM sys_staff_org org
+        left join  sys_staffinfo staff on staff.sid =org.staffSid
+        left join  sys_user user on user.staffSid =org.staffSid
+        WHERE org.orgSid = #{orgSid} and user.sid is not null
+    </select>
 
     <select id="getUseOrgByUserSid" resultType="com.yxt.supervise.system.sysstafforg.SysStaffOrgVo">
         select orgSidPath

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationRest.java

@@ -13,12 +13,10 @@ import com.yxt.common.core.query.PagerQuery;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.io.File;
 import java.util.*;
@@ -87,6 +85,17 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         return rb.success().setData(list);
     }
 
+    /**
+     * 获取组织结构下人员信息
+     * @return
+     */
+    @ApiOperation("获取组织结构下人员信息")
+    @GetMapping("/userList")
+    public ResultBean<List<SysOrganizationVo>> userList() {
+        ResultBean rb = ResultBean.fireFail();
+        List<SysOrganizationVo> list = sysOrganizationService.userList();
+        return rb.success().setData(list);
+    }
     @Override
     public ResultBean save(SysOrganizationDto dto) {
         ResultBean rb = ResultBean.fireFail();

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationService.java

@@ -16,6 +16,7 @@ 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.system.sysuser.SysUserVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -150,8 +151,26 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         getChildList(sysOrganizations);
         return sysOrganizations;
     }
-
+    public List<SysOrganizationVo> userList() {
-
+        List<SysOrganizationVo> sysOrganizations = baseMapper.selectFirstOrgList();
+        getChildList(sysOrganizations);
+        getUserList(sysOrganizations);
+        return sysOrganizations;
+    }
+    public void getUserList(List<SysOrganizationVo> list) {
+        for(SysOrganizationVo sysOrganizationVo:list){
+            for (SysOrganizationVo sysOrganizationVo1:sysOrganizationVo.getChildren()){
+//                if(sysOrganizationVo1.getUserList().size()>0){
+                    for(SysOrganizationVo s:sysOrganizationVo1.getChildren()){
+                        List<SysOrganizationVo> listUser = baseMapper.selectUserList(s.getSid());
+                        s.setChildren(listUser);
+                    }
+//                }
+                List<SysOrganizationVo> listUser = baseMapper.selectUserList(sysOrganizationVo1.getSid());
+                sysOrganizationVo1.setChildren(listUser);
+            }
+        }
+    }
     public void getChildList(List<SysOrganizationVo> list) {
         list.forEach(str -> {
             String sid = str.getSid();

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

@@ -225,6 +225,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getMobile())) {
             qw.like("sta.mobile", query.getMobile());
         }
+        if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getPersonTypeKey())) {
+            qw.like("user.userType", query.getPersonTypeKey());
+        }
+
 //        qw.ne("staff.personTypeKey","01");
         IPage<SysStaffinfoVo> sysStaffinfoVoIPage = baseMapper.pagerListNew(page, qw);
         List<SysStaffinfoVo> records = sysStaffinfoVoIPage.getRecords();

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

@@ -180,6 +180,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     String selectIdBySid(@Param("list") List<String> stringList);
 
     List<SysUserVo> getUserMessageByRole(@Param("roleSid") String roleSid,@Param("levelOrgSid") String levelOrgSid, @Param("list") List<String> stringList);
-
+    String fetchByUserNameAndUserPhone(@Param("userName") String userName, @Param("userPhone") String userPhone);
     List<SysUserVo> getUserByType(@Param("userType")String userType);
+    List<SysUserVo> getUserOrgBySid(@Param("sid")String sid);
 }

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

@@ -380,4 +380,19 @@
             select * from sys_user s  where s.userType=#{userType}
         </if>
     </select>
+    <select id="getUserOrgBySid" resultType="com.yxt.supervise.system.sysuser.SysUserVo">
+        select s.*,f.name as name ,org.name as organizationName from sys_user s
+            left join sys_staffinfo f on f.sid=s.staffSid
+            left join sys_staff_org sta on sta.staffSid =f.sid
+            left join sys_organization org on org.sid =sta.orgSid
+        WHERE s.sid=#{sid}
+    </select>
+    <select id="fetchByUserNameAndUserPhone" resultType="java.lang.String">
+        SELECT su.`sid`
+        FROM sys_user su
+                 LEFT JOIN sys_staffinfo ss
+                           ON su.`staffSid` = ss.`sid`
+        WHERE ss.name = #{userName}
+          AND su.mobile = #{userPhone}
+    </select>
 </mapper>

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

@@ -450,8 +450,8 @@ public class SysUserRest implements SysUserFeign {
     }
 
     @Override
-    public ResultBean reGetPwd(String userName, String userPhone) {
+    public ResultBean reGetPwd(String userName, String userPhone,String verificationCode) {
-        return sysUserService.reGetPwd(userName, userPhone);
+        return sysUserService.reGetPwd(userName, userPhone,verificationCode);
     }
 
     @Override
@@ -707,6 +707,10 @@ public class SysUserRest implements SysUserFeign {
     public ResultBean getUserByType(@RequestParam("userType") String userType){
         return sysUserService.getUserByType(userType);
     }
+    @GetMapping("getUserOrgBySid")
+    public ResultBean getUserOrgBySid(@RequestParam("sid") String sid){
+        return sysUserService.getUserOrgBySid(sid);
+    }
 
     @PostMapping("/uploadfile")
     public ResultBean<FileUploadResult> uploadImage(@RequestParam(value = "file") MultipartFile file) {

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

@@ -258,6 +258,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         }
         redisUtil.remove(user.getUserName());
         // 3.给用户发送手机短信
+//        MsgWs.SendWaitWorkMsg(mobile, user.getUserName() + SmsFeign.MSG_NEWPWD + substring);
         return true;
     }
 
@@ -592,15 +593,17 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
      * 发送手机端登录验证码
      *
      * @param mobile
-     * @param type   1、登录2、修改密码3、找回密码
+     * @param type   1、登录2、修改密码3、找回密码 4绑定
      * @return
      */
     public ResultBean sendVerificationCodeForApp(String mobile, String type) {
         ResultBean rb=new ResultBean().fireFail();
+        if(type.equals("4")){
             SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().eq("mobile",mobile));
             if(null==sysUser){
                 return rb.setMsg("您的平台应用未被授权，请联系工作人员。");
             }
+        }
         Date date = new Date();
         String redisKey = "";
          if (type.equals("1")) {
@@ -635,8 +638,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
             content = "登录验证码：" + verificationCode + "，有效期5分钟，如非本人操作，请忽略。";
         } else if(type.equals("4")){
             content = "账户绑定验证码：" + verificationCode + "，有效期5分钟，如非本人操作，请忽略。";
-        }else {
+        }else if(type.equals("3")){
-            content = "修改密码验证码：" + verificationCode + "，用于修改登录密码,有效期5分钟，如非本人操作，请忽略该短信。";
+            content = "找回密码验证码：" + verificationCode + "，用于找回密码,有效期5分钟，如非本人操作，请忽略该短信。";
         }
         String res = com.yxt.supervise.utils.MsgWs.SendWaitWorkMsg(mobile, content);
 //		String res = "1";
@@ -809,13 +812,23 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
     /**
      * @param mobile           手机号
      * @param verificationCode 验证码
+     * @param type 验证码类型
      * @description: 绑定微信验证验证码是否正确
      * @return:
      * @Author: dimengzhe
      * @Date: 2021/10/6 11:02
      */
-    public Map<String, Object> mobileValidateWxRegister(String mobile, String verificationCode) {
+    public Map<String, Object> mobileValidateWxRegister(String mobile, String verificationCode,String type) {
-        String key = "binding" + mobile;
+        String key = "";
+        if (type.equals("1")) {
+            key = "loginCode"+ mobile;
+        } else if (type.equals("2")) {
+            key = "updatePwdCode"+mobile;
+        } else if (type.equals("3")) {
+            key = "resetPwdCode"+mobile;
+        }else if(type.equals("4")){
+            key = "binding"+mobile;
+        }
         String code = redisUtil.get(key);
         if (StringUtils.isNotBlank(code)) {
             code = code.substring(0, 4);
@@ -977,9 +990,22 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         return baseMapper.selectByMobile(mobile);
     }
 
-    public ResultBean reGetPwd(String userName, String userPhone) {
+    public ResultBean reGetPwd(String userName, String userPhone,String verificationCode) {
         ResultBean rb = ResultBean.fireFail();
-        return null;
+        String userSid = baseMapper.fetchByUserNameAndUserPhone(userName, userPhone);
+
+        if (StringUtils.isNotBlank(userSid)) {
+            Map<String, Object>vali=mobileValidateWxRegister(userPhone,verificationCode,"3");
+            if(!vali.get("code").equals("200")){
+                return rb.setMsg(vali.get("details").toString());
+            }
+            Boolean aBoolean = initPwd(userSid);
+            if (!aBoolean) {
+                return ResultBean.fireFail().setMsg("初始化密码失败");
+            }
+            return ResultBean.fireSuccess().setMsg("初始化密码成功");
+        }
+        return rb.setMsg("姓名或手机号填写不正确");
     }
 
     public int updateIsEnable(String sid, String isEnable) {
@@ -1411,7 +1437,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
 //        SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().eq("mobile",mobile));
         if (sysUser != null) {
             //手机号存在再验证验证码
-            Map<String, Object> vali = mobileValidateWxRegister(mobile,code);
+            Map<String, Object> vali = mobileValidateWxRegister(mobile,code,"4");
             if(!vali.get("code").equals("200")){
                 return rb.setMsg(vali.get("details").toString());
             }
@@ -1438,7 +1464,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
 
         // 校验手机验证码
         String code = sysUserWxBindMobileDto.getCode();
-        Map<String, Object> vali = mobileValidateWxRegister(mobile,code);
+        Map<String, Object> vali = mobileValidateWxRegister(mobile,code,"4");
         if(!vali.get("code").equals("200")){
             return rb.setMsg(vali.get("details").toString());
         }
@@ -1471,6 +1497,11 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         List<SysUserVo> list=baseMapper.getUserByType(userType);
         return rb.success().setData(list);
     }
+    public ResultBean getUserOrgBySid(String sid){
+        ResultBean rb=new ResultBean();
+        List<SysUserVo> list=baseMapper.getUserOrgBySid(sid);
+        return rb.success().setData(list);
+    }
 
     public ResultBean updateSysUserImage(Map<String, String> map){
         String userSid = map.get("userSid");

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

@@ -194,7 +194,7 @@ public class WxSysUserRest implements WxSysUserFeign {
             return rb.setMsg("该手机号已注册");
         }
         //验证码是否正确
-        Map<String, Object> map = sysUserService.mobileValidateWxRegister(mobile, verificationCode);
+        Map<String, Object> map = sysUserService.mobileValidateWxRegister(mobile, verificationCode,"1");
         String code = map.get("code").toString();
         boolean isSave = false;
         if (Tools.CODE_SUCCESS.equals(code)) {
@@ -373,7 +373,7 @@ public class WxSysUserRest implements WxSysUserFeign {
     @ApiOperation(value = "验证验证码是否正确")
     @GetMapping("/mobileValidateWxRegister")
     public Map<String, Object> mobileValidateWxRegister(String mobile,String verificationCode){
-        return sysUserService.mobileValidateWxRegister(mobile, verificationCode);
+        return sysUserService.mobileValidateWxRegister(mobile, verificationCode,"4");
     }
     @PostMapping("/wxBindMobile")
     @ApiOperation(value = "微信绑定手机")