电签权限提示

blade-service/blade-business/src/main/java/org/springblade/business/controller/EVisaTaskCheckController.java

@@ -163,12 +163,12 @@ public class EVisaTaskCheckController {
             //获取电签配置，先获取所有节点的infoIds
             List<Long> list = Func.toLongList( json.getString("infoIds"));
             if (list == null || list.size() <= 0){
-                return R.data(300, null, "请选择一条数据");
+                return R.fail( "请选择一条数据");
             }
             List<InformationQuery> infoList = informationQueryService.list(new LambdaQueryWrapper<InformationQuery>()
                     .in(InformationQuery::getId, list));
             if (infoList == null || infoList.size() <= 0){
-                return R.data(300, null, "没有获取到当前所有资料的上报信息");
+                return R.fail("没有获取到当前所有资料的上报信息");
             }
             //获取这些审批人在资料合同段的权限
             List<JSONObject> userRoleList = this.saveUserInfoByProjectClient.queryUserContractRole(customFlowUserList, infoList.get(0).getContractId()+"");
@@ -177,11 +177,11 @@ public class EVisaTaskCheckController {
                 Long contractId = jdbcTemplate.queryForObject("SELECT id from m_contract_info mci WHERE contract_type = 2 \n" +
                         "and id in (SELECT contract_id_jlyz  FROM m_contract_relation_jlyz WHERE contract_id_sg = " + json.getString("contractId")+")",Long.class);
                 if (contractId == null) {
-                    return R.data(300, false, "所选审批人均未找到当前表格所需要的签字岗位，请联系服务人员处理");
+                    return R.fail( "所选审批人均未找到当前表格所需要的签字岗位，请联系服务人员处理");
                 }
                 userRoleList = this.saveUserInfoByProjectClient.queryUserContractRole(customFlowUserList, contractId+"");
                 if (userRoleList == null || userRoleList.size() <= 0){
-                    return R.data(300, false, "所选审批人均未找到当前表格所需要的签字岗位，请联系服务人员处理");
+                    return R.fail("所选审批人均未找到当前表格所需要的签字岗位，请联系服务人员处理");
                 }
             }
 
@@ -189,7 +189,7 @@ public class EVisaTaskCheckController {
             for (InformationQuery info : infoList) {
                 List<JSONObject> jsonList = this.queryTableEVisaConfig(json,info.getPdfUrl());
                 if (jsonList == null || jsonList.size() <= 0) {
-                    return R.data(300, false, info.getName() + ":未找到电签配置");
+                    return R.fail( info.getName() + ":未找到电签配置");
                 }
 
                 //汇总电签配置的审批角色
@@ -219,7 +219,7 @@ public class EVisaTaskCheckController {
                 for (String key : userNameFail.keySet()) {
                     stringBuilder.append("所选中的用户【" + key + "】不具备【" + StringUtils.join(userNameFail.get(key), ",") + "】表格所需要的签字岗位，请联系维护人员处理或更换审批人员");
                 }
-                return R.data(300, false, stringBuilder.toString());
+                return R.fail(stringBuilder.toString());
             }
 
             //均满足
@@ -346,7 +346,7 @@ public class EVisaTaskCheckController {
         //获取电签配置，先获取所有节点的infoIds
         List<Long> list = Func.toLongList( json.getString("infoIds"));
         if (list == null || list.size() <= 0){
-            return R.data(300, null, "请选择一条数据");
+            return R.fail("请选择一条数据");
         }
         List<InformationQuery> infoList = informationQueryService.list(new LambdaQueryWrapper<InformationQuery>()
                 .in(InformationQuery::getId, list));
@@ -354,7 +354,7 @@ public class EVisaTaskCheckController {
         for (InformationQuery info : infoList) {
             List<JSONObject> jsonList = this.queryTableEVisaConfig(json,info.getPdfUrl());
             if (jsonList == null || jsonList.size() <= 0) {
-                return R.data(300, null, info.getName() + "：没有配置电签,请尝试重新保存再上报");
+                return R.fail("资料没有配置电签,请尝试重新保存再上报");
             }
 
             //汇总电签配置的审批角色