From 70cb693dc87407b659f6ac11827b4e0f56c4a641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 30 Jan 2024 22:31:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=80=99=E9=80=89=E4=BA=BA?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8D=E6=88=90=E5=8A=9F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 1 +
 xm-cloud-bootstrap/pom.xml                                    | 4 ++--
 xm-cloud-bootstrap/src/main/java/com/XmApplication.java       | 2 --
 xm-core/src/main/java/com/xm/core/mapper/XmProjectMapper.xml  | 2 +-
 .../main/java/com/xm/core/service/XmTaskExecuserService.java  | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 989a0d4d..2c515562 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
 	<modules>
 		<module>xm-core</module>
 		<module>xm-bootstrap</module>
+		<module>xm-cloud-bootstrap</module>
 	</modules>
 	<dependencyManagement>
 		<dependencies>
diff --git a/xm-cloud-bootstrap/pom.xml b/xm-cloud-bootstrap/pom.xml
index aa12d8b4..a6aea9ed 100644
--- a/xm-cloud-bootstrap/pom.xml
+++ b/xm-cloud-bootstrap/pom.xml
@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>xm-bootstrap</artifactId>
+  <artifactId>xm-cloud-bootstrap</artifactId>
   <packaging>jar</packaging>
-  <name>xm-bootstrap 唛盟云-项目管理系统服务端cloud启动器</name>
+  <name>xm-cloud-bootstrap 唛盟云-项目管理系统服务端cloud启动器</name>
     <parent>
         <groupId>com.xm</groupId>
         <artifactId>xm-backend</artifactId>
diff --git a/xm-cloud-bootstrap/src/main/java/com/XmApplication.java b/xm-cloud-bootstrap/src/main/java/com/XmApplication.java
index 410f5e25..fe8eb5ff 100644
--- a/xm-cloud-bootstrap/src/main/java/com/XmApplication.java
+++ b/xm-cloud-bootstrap/src/main/java/com/XmApplication.java
@@ -1,10 +1,8 @@
 package com;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.cloud.client.SpringCloudApplication;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 
-@SpringCloudApplication
 @EnableRedisHttpSession
 public class XmApplication  {
 	
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmProjectMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmProjectMapper.xml
index 0196a88b..73f59e20 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmProjectMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmProjectMapper.xml
@@ -67,7 +67,7 @@
         <if test='(ext.isTpl==null or ext.isTpl=="0") and (ext.linkProductId ==null or ext.linkProductId=="") and (ext.linkIterationId ==null or ext.linkIterationId=="")'>
             and (
             exists(select 1 from xm_group_user gu where gu.userid=#{ext.myUserid} and gu.project_id=res.id)
-            (res.create_userid = #{ext.myUserid} or res.adm_userid= #{ext.myUserid} or res.pm_userid=#{ext.myUserid} or res.ass_userid=#{ext.myUserid})
+            or (res.create_userid = #{ext.myUserid} or res.adm_userid= #{ext.myUserid} or res.pm_userid=#{ext.myUserid} or res.ass_userid=#{ext.myUserid})
             or (CASE
             WHEN res.show_out = '1' THEN
             res.branch_id = #{ext.myBranchId}
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java
index dc60a08c..5650a41d 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java
@@ -109,7 +109,7 @@ public class XmTaskExecuserService extends BaseService<XmTaskExecuserMapper,XmTa
 			List<XmGroupVo> userGroups=groupService.getUserGroups(pgroups, xmTaskExecuser.getBidUserid());
 			XmTaskExecuser xmTaskExecuser2=new XmTaskExecuser();
 			xmTaskExecuser2.setTaskId(xmTaskExecuser.getTaskId());
-			xmTaskExecuser2.setPrjUserid(xmTaskExecuser.getBidUserid());
+			xmTaskExecuser2.setBidUserid(xmTaskExecuser.getBidUserid());
 			xmTaskExecuser2.setStatus("7");
 			this.updateSomeFieldByPk(xmTaskExecuser2);
 			projectId=xmTaskExecuser.getProjectId();