预算及成本重构

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

@@ -379,10 +379,18 @@ public class XmTaskController {
 			if(!tips.isOk()){
 				 return ResponseHelper.failed(tips);
 			}
+			if(!StringUtils.hasText(xmTaskVo.getCreateUserid())){
 				xmTaskVo.setCreateUserid(user.getUserid());
 				xmTaskVo.setCreateUsername(user.getUsername());
-			xmTaskVo.setExecutorUserid(user.getUserid());
-			xmTaskVo.setExecutorUsername(user.getUsername());
+			}
+			xmTaskVo.setExecutorUserid(null);
+			xmTaskVo.setExecutorUsername(null);
+			xmTaskVo.setExeUserids(null);
+			xmTaskVo.setExeUsernames(null);
+			xmTaskVo.setTagIds(null);
+			xmTaskVo.setTaskSkillIds(null);
+			xmTaskVo.setTaskSkillNames(null);
+			xmTaskVo.setTagNames(null);
 			xmTaskVo.setCreateTime(new Date());
 			xmTaskVo.setCbranchId(user.getBranchId());
 			xmTaskVo.setCdeptid(user.getDeptid());

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

@@ -222,13 +222,13 @@
 		<if test="childrenCnt==true">
 			(select count(*) from xm_menu m where m.pmenu_id=res.menu_id) as children_cnt,
 		</if>
-		res.* from xm_menu res inner join xm_product p on res.product_id=p.id where
+		res.* from xm_product p inner join  xm_menu res  on res.product_id=p.id where
 		res.menu_id in
 		<foreach collection="menuIds" item="item" index="index" open="(" separator="," close=")" >
 			#{item}
 		</foreach>
-		and ( (p.adm_userid=#{mmUserid} or p.pm_userid=#{mmUserid} or p.ass_userid=#{mmUserid})
-			or exists( select 1 from xm_menu m where  FIND_IN_SET(m.menu_id,res.pid_paths) and m.mm_userid=#{mmUserid} )
+		and ( #{mmUserid} in (p.adm_userid,p.pm_userid, p.ass_userid)
+			or exists( select 1 from xm_menu m where res.pid_paths like concat(m.pid_paths,'%') and m.mm_userid=#{mmUserid} )
 		    )
 	</select>
 	<!--结束 自定义sql函数区域-->