预算及成本重构

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

@@ -392,6 +392,7 @@ public class XmTaskController {
 			xmTaskVo.setCreateTime(new Date());
 			xmTaskVo.setCbranchId(user.getBranchId());
 			xmTaskVo.setCdeptid(user.getDeptid());
+			xmTaskVo.setTaskState("0");
 
 
 			xmTaskVo.setRate(0);

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

@@ -392,7 +392,7 @@ public class XmGroupService extends BaseService {
     			return true;
 			}else{
 				Optional<XmGroupVo> optional=xmGroupVoList.stream().filter(i->i.getId().equals(ug.getPgroupId())).findAny();
-				while (optional!=null  && !optional.isPresent()){
+				while (optional!=null  && optional.isPresent()){
 					XmGroupVo g=optional.get();
 					if(headUserid.equals(g.getLeaderUserid())){
 						return true;
@@ -427,7 +427,7 @@ public class XmGroupService extends BaseService {
 				return true;
 			}else{
 				Optional<XmGroupVo> optional=xmGroupVoList.stream().filter(i->i.getId().equals(ug.getPgroupId())).findAny();
-				while (optional!=null  && !optional.isPresent()){
+				while (optional!=null  && optional.isPresent()){
 					XmGroupVo g=optional.get();
 					if(headUserid.equals(g.getLeaderUserid())||headUserid.equals(g.getAssUserid())){
 						return true;

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

@@ -228,7 +228,7 @@
 			#{item}
 		</foreach>
 		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} )
+			or exists( select 1 from xm_menu m where m.mm_userid=#{mmUserid} and res.pid_paths like concat(m.pid_paths,'%')  )
 		    )
 	</select>
 	<!--结束 自定义sql函数区域-->