From 771ae27e072f3632cf8fe54f0836e350af5174f1 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Tue, 19 Sep 2023 17:46:04 +0800
Subject: [PATCH] 9/19

---
 .../crm/biz/enterpriseproject/EnterpriseProjectMapper.xml | 3 +--
 .../biz/projectinformation/ProjectInformationRest.java    | 8 ++++----
 .../biz/projectinformation/ProjectInformationService.java | 5 +++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml
index c11bede5..e313d1d1 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml
@@ -19,9 +19,8 @@
     <select id="getEnterpriseByProjectSid" resultType="com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo">
         SELECT e.*,i.enterpriseName as enterpriseName
         FROM enterprise_project e left join enterprise_information i on i.sid=e.enterpriseSid
-        WHERE projectSid=#{sid} and enterpriseSid!=(select enterpriseSid from project_information where sid=#{sid})
+        WHERE projectSid=#{sid}
     </select>
-    
     <select id="getBankManager" resultType="com.yxt.supervise.crm.api.bankmanager.BankManagerVo">
         SELECT *
         FROM bank_manager
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java
index fe07dd51..33a2c0db 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java
@@ -65,11 +65,11 @@ public class ProjectInformationRest implements ProjectInformationFeign {
         return ProjectInformationService.update(dto);
     }
 
-    @ApiOperation("根据sid查询")
-    @GetMapping("/getProjectBySid/{sid}")
-    public ResultBean getWarehouse(@PathVariable String sid){
+    @ApiOperation("根据sid查询企业信息")
+    @GetMapping("/getEnterpriseBySid/{sid}")
+    public ResultBean getEnterpriseBySid(@PathVariable String sid){
         ResultBean rb = ResultBean.fireFail();
-        ProjectInformationVo ProjectInformationVo=ProjectInformationService.getProjectBySid(sid);
+        ProjectInformationVo ProjectInformationVo=ProjectInformationService.getEnterpriseBySid(sid);
         return rb.success().setData(ProjectInformationVo);
     }
     @ApiOperation("根据sid查询仓库信息")
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
index d1dcabfd..f7247bed 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
@@ -111,6 +111,7 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         storeHouseProjectService.saveOrUpdateDto(dto.getStoreHouseProjectDto());
         //绑定企业
         if(null!=dto.getEnterpriseProjectDto()){
+            dto.getEnterpriseProjectDto().setProjectSid(dto.getSid());
             enterpriseProjectService.update(dto.getEnterpriseProjectDto());
         }
         //银行
@@ -122,7 +123,7 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         baseMapper.updateById(entity);
         return rb.success().setMsg("修改项目信息成功");
     }
-    public ProjectInformationVo getProjectBySid(String sid){
+    public ProjectInformationVo getEnterpriseBySid(String sid){
         ProjectInformationVo bank=baseMapper.getProjectBySid(sid);
         List<EnterpriseProjectVo> enterpriseProjectVoList=enterpriseProjectService.getEnterpriseByProjectSid(sid);
         bank.setEnterpriseProjectVoList(enterpriseProjectVoList);
@@ -149,7 +150,7 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
             List<UserProject> projectSidListByUserSid = userProjectService.getProjectSidListByUserSid(sid);
             List<ProjectInformationVo> list = new ArrayList<>();
             for (UserProject userProject : projectSidListByUserSid) {
-                ProjectInformationVo project = getProjectBySid(userProject.getProjectSid());
+                ProjectInformationVo project = getEnterpriseBySid(userProject.getProjectSid());
                 list.add(project);
             }
             return list;