diff --git a/pom.xml b/pom.xml index 989a0d4d..2c515562 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,7 @@ xm-core xm-bootstrap + xm-cloud-bootstrap 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 @@ 4.0.0 - xm-bootstrap + xm-cloud-bootstrap jar - xm-bootstrap 唛盟云-项目管理系统服务端cloud启动器 + xm-cloud-bootstrap 唛盟云-项目管理系统服务端cloud启动器 com.xm xm-backend 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 @@ 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 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();