添加候选人到团队中

xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java

@@ -111,22 +111,21 @@ public class XmProjectController {
 		xmProject.put("userid",user.getUserid());
 		if( !(StringUtils.hasText(id) || StringUtils.hasText(myFocus)|| StringUtils.hasText(productId)||ids!=null
 				|| StringUtils.hasText(myExecuserStatus)||pgTypeIds!=null|| StringUtils.hasText(createUserid)) ){
-			if(LoginUtils.isBranchAdmin()){
-				xmProject.put("branchId",user.getBranchId());
-			}else {
+			if(!LoginUtils.isBranchAdmin()){
 				xmProject.put("compete",user.getUserid());
 			}
-
 		}
 		if(!StringUtils.hasText((String) xmProject.get("isTpl"))){
 			xmProject.put("isTpl","0");
 		}else{
 			if("1".equals(xmProject.get("isTpl"))){
 				xmProject.remove("branchId");
-				xmProject.put("myBranchId",user.getBranchId());
+				xmProject.put("linkBranchId",user.getBranchId());
 				xmProject.put("platformBranchId",platformBranchId);
 			}
 		}
+		xmProject.put("linkBranchId",user.getBranchId());
+		xmProject.put("platformBranchId",platformBranchId);
 		List<Map<String,Object>> xmProjectList = xmProjectService.getProject(xmProject);	//列出XmProject列表
 		PageUtils.responePage(m, xmProjectList);
 		m.put("data",xmProjectList);

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml

@@ -55,11 +55,17 @@
 		</if>
 		<if test="key != null and key !='' ">  and res.name like #{key}  </if>
 		<if test="isTpl!=null and isTpl=='1'">
-			and (res.branch_id in( #{platformBranchId},#{myBranchId}) and res.is_tpl='1')
+			and (res.branch_id in( #{platformBranchId},#{linkBranchId}) and res.is_tpl='1')
 		</if>
 		<if test="del==null or del==''">
 			and res.del!="1"
 		</if>
+		<if test="linkBranchId!=null and linkBranchId!=''">
+			and ( res.branch_id=#{linkBranchId}
+			<if test="isTpl!=null and isTpl=='1'">
+				or (res.branch_id in( #{platformBranchId},#{linkBranchId}) and res.is_tpl='1')
+			</if>)
+		</if>
     </sql>
 
 	<!--结束 自定义sql函数区域-->