任务编辑bug

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

@@ -73,6 +73,11 @@ public class XmProjectGroupController {
 			return m;
 		}
 		String projectId = xmProjectGroupVo.get(0).getProjectId();
+		if(!StringUtils.hasText(projectId)){
+			tips.setFailureMsg("项目编号projectId不能为空");
+			m.put("tips", tips);
+			return m;
+		}
 		tips= xmProjectGroupService.updateGroup(projectId,xmProjectGroupVo);	//列出XmProjectGroup列表
 		//m.put("data",xmProjectGroupVo);
 		m.put("tips", tips);

xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java

@@ -364,6 +364,50 @@ public class XmProjectGroupService extends BaseService {
         		});
 
 
+
+
+        		if(allUsersAdd.size()>0) {
+        			xmProjectGroupUserService.batchInsert(allUsersAdd); 
+        			allUsersAdd.forEach(u->{
+        				Map<String,Object> usermap=new HashMap<>();
+        				usermap.put("userid", u.getUserid());
+        				usermap.put("username", u.getUsername());
+        				List<Map<String,Object>> users=new ArrayList<>();
+        				users.add(usermap);
+        				pushMsgService.pushJoinChannelGroupMsg(user.getBranchId(), u.getGroupId(), users);
+        				xmRecordService.addXmGroupRecord(projectId,u.getGroupId(), "项目-团队-新增小组成员", "增加组员["+u.getUsername()+"]",u.getUserid(),null); 
+        			});
+        			
+	            	
+        		}
+        		if(allUsersDel.size()>0) {
+        			xmProjectGroupUserService.batchDelete(allUsersDel);
+        			allUsersDel.forEach(u->{
+        				Map<String,Object> usermap=new HashMap<>();
+        				usermap.put("userid", u.getUserid());
+        				usermap.put("username", u.getUsername());
+        				List<Map<String,Object>> users=new ArrayList<>();
+        				users.add(usermap);
+        				pushMsgService.pushLeaveChannelGroupMsg(user.getBranchId(), u.getGroupId(), users);
+        				xmRecordService.addXmGroupRecord(projectId,u.getGroupId(), "项目-团队-删除小组成员", "删除组员["+u.getUsername()+"]",u.getUserid(),null); 
+        			}); 
+
+        		} 
+        		if(allUsersEdit.size()>0) {
+            		List<XmProjectGroupUser> allUsersEdit2=new ArrayList<>();
+        			allUsersEdit.forEach(u->{
+        				XmProjectGroupUser u2=new XmProjectGroupUser();
+        				u2.setId(u.getId());
+        				u2.setIsHead(u.getIsHead());
+        				allUsersEdit2.add(u2);
+        				xmProjectGroupUserService.updateSomeFieldByPk(u2);
+        				xmRecordService.addXmGroupRecord(projectId, u2.getGroupId(),"项目-团队-变更小组成员状态", "变更["+u.getUsername()+"]为 "+("0".equals(u2.getIsHead())?"普通组员":"组长"),u2.getUserid(),null); 
+        			});  
+        		} 
+        		
+        	}
+        }
+
 		if(delGroups.size()>0) {
 			delGroups.forEach(g->{
 
@@ -378,7 +422,6 @@ public class XmProjectGroupService extends BaseService {
 			});
 
 		}
-
 		if(xmProjectGroupVoAdd.size()>0) {
 			xmProjectGroupVoAdd.forEach(gvo -> {
 				gvo.setId(xmProjectGroupService.createKey("id"));
@@ -411,48 +454,6 @@ public class XmProjectGroupService extends BaseService {
 
 			});
 		}
-
-        		if(allUsersAdd.size()>0) {
-        			xmProjectGroupUserService.batchInsert(allUsersAdd); 
-        			allUsersAdd.forEach(u->{
-        				Map<String,Object> usermap=new HashMap<>();
-        				usermap.put("userid", u.getUserid());
-        				usermap.put("username", u.getUsername());
-        				List<Map<String,Object>> users=new ArrayList<>();
-        				users.add(usermap);
-        				pushMsgService.pushJoinChannelGroupMsg(user.getBranchId(), u.getGroupId(), users);
-        				xmRecordService.addXmGroupRecord(projectId,u.getGroupId(), "项目-团队-新增小组成员", "增加组员["+u.getUsername()+"]",u.getUserid(),null); 
-        			});
-        			
-	            	
-        		}
-        		if(allUsersDel.size()>0) {
-        			xmProjectGroupUserService.batchDelete(allUsersDel);
-        			allUsersDel.forEach(u->{
-        				Map<String,Object> usermap=new HashMap<>();
-        				usermap.put("userid", u.getUserid());
-        				usermap.put("username", u.getUsername());
-        				List<Map<String,Object>> users=new ArrayList<>();
-        				users.add(usermap);
-        				pushMsgService.pushLeaveChannelGroupMsg(user.getBranchId(), u.getGroupId(), users);
-        				xmRecordService.addXmGroupRecord(projectId,u.getGroupId(), "项目-团队-删除小组成员", "删除组员["+u.getUsername()+"]",u.getUserid(),null); 
-        			}); 
-
-        		} 
-        		if(allUsersEdit.size()>0) {
-            		List<XmProjectGroupUser> allUsersEdit2=new ArrayList<>();
-        			allUsersEdit.forEach(u->{
-        				XmProjectGroupUser u2=new XmProjectGroupUser();
-        				u2.setId(u.getId());
-        				u2.setIsHead(u.getIsHead());
-        				allUsersEdit2.add(u2);
-        				xmProjectGroupUserService.updateSomeFieldByPk(u2);
-        				xmRecordService.addXmGroupRecord(projectId, u2.getGroupId(),"项目-团队-变更小组成员状态", "变更["+u.getUsername()+"]为 "+("0".equals(u2.getIsHead())?"普通组员":"组长"),u2.getUserid(),null); 
-        			});  
-        		} 
-        		
-        	}
-        } 
 		groupCacheService.putGroups(projectId, null);
 
         Tips tips=new Tips("全部更新成功");

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

@@ -42,7 +42,7 @@
 			</if>
 
 			<if test=' projectId !=null and projectId!="" and ( taskFilterType==null or taskFilterType=="" )'>
-				and  exists ( select 1 from XM.xm_task t where t.menu_id =res.id and t.project_id=#{projectId})
+				and  exists ( select 1 from XM.xm_task t where t.menu_id =res.menu_id and t.project_id=#{projectId})
 			</if>
 			 <if test="compete !=null and compete!=''">
 				and (   exists ( select 1 from XM.xm_menu m1 where m.mm_userid=#{compete} and m.product_id=res.product_id)
@@ -63,7 +63,6 @@
 				    </foreach>
 			 </if>
 			<include refid="where"/>
-			<if test=" projectId !=null and projectId !='' "> and plan.project_id=#{projectId}</if>
 			<if test=' iterationFilterType=="join" '>
 				and exists ( select 1 from XM.xm_iteration_menu im where im.menu_id=res.menu_id
 				<if test="iterationId!=null"> and im.iteration_id=#{iterationId}</if>
@@ -77,6 +76,9 @@
 				exists ( select 1 from XM.xm_task t where  t.menu_id=res.menu_id)
 			</if>
 
+			<if test=' projectId !=null and projectId!="" and ( taskFilterType==null or taskFilterType=="" )'>
+				and  exists ( select 1 from XM.xm_task t where t.menu_id =res.menu_id and t.project_id=#{projectId})
+			</if>
 			<if test="compete !=null and compete!=''">
 				and (   exists ( select 1 from XM.xm_menu m1 where m.mm_userid=#{compete} and m.product_id=res.product_id)
 				or exists ( select 1 from xm_product p where p.pm_userid=#{compete} and res.product_id=p.id)