Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TaskModelDto.java

@@ -103,5 +103,9 @@ public class TaskModelDto {
          * 下一节点执行角色
          */
         private String nextExecuteUser;
+        /**
+         * 是否跳转编辑页面
+         * */
+        private String pageType;
 }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -678,7 +678,7 @@ public class CommonServiceImpl implements ICommonService {
                 }
                 //其他逻辑均按详情页面获取
                 else if (map.get("type").equals(obj.getTaskType())
-                        && map.get("pageType").equals("look")) {
+                        && map.get("pageType").equals(null == obj.getPageType()?"look":obj.getPageType())) {
                     model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()) + urlParams + "&nextExecuteUserIds=" + model.getExecuteUserIds());
                     break;
                 }