Merge branch 'develop_tzs_register' of…

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

@@ -823,7 +823,7 @@ public class CommonServiceImpl implements ICommonService {
             }
             List<Map> urlList = JsonUtils.getResourceList(urlInfo);
             for (Map map : urlList) {
-                if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode())  && map.get("pageType").equals("edit")) {
+                if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) &&  obj.getString("taskType").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && map.get("pageType").equals("edit")) {
                     model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getString("nextExecuteUser")) + urlParams + "&nextExecuteUserIds=" + model.getExecuteUserIds());
                     break;
                 }else if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals("look")) {

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/JgChangeRegistrationTransferServiceImpl.java

@@ -169,8 +169,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             throw new BadRequest("参数校验失败.");
         }
         CompanyBo company = reginParams.getCompany();
-        String sequenceNbr = (String) tableData.get("sequenceNbr");
-        String equId = (String) tableData.get("record");
+        String sequenceNbr = (String) map.get("sequenceNbr");
+        String equId = (String) map.get("equipId");
         String receiveOrgCode = (String) tableData.get("receiveOrgCode");
         String receiveOrgName = "";
         String supervisoryCode = "";