Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
f2b3713736
  1. 2
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  2. 2
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml

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

@ -304,7 +304,7 @@ public class XmTaskController {
List<XmTask> can=new ArrayList<>();
List<XmTask> no=new ArrayList<>();
if(can.size()<=0){
return ResponseHelper.failed("noqx","您无权修改选中的任务。");
//return ResponseHelper.failed("noqx","您无权修改选中的任务。");
}
Set<String> fields=new HashSet<>();
fields.add("childrenCnt");

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

@ -31,6 +31,8 @@
</if>
<if test="key != null and key !='' "> and res.name like #{key} </if>
<if test="work != null and work != ''"> and res.status != 'resolved' </if>
<if test="linkIterationId != null and linkIterationId != ''"> and exists (select 1 from xm_menu m where m.iteration_id=#{linkIterationId} and m.menu_id=res.menu_id) </if>
</sql>
<!-- 插入流程审批表数据 -->
<insert id="insertProcessApprova"

Loading…
Cancel
Save