소스 검색

接口参数调整、角色获取接口修改

user5 2 년 전
부모
커밋
a90ee82d74

+ 16 - 0
jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/controller/RoleController.java

@@ -56,6 +56,22 @@ public class RoleController {
 		return ResponseEntity.ok (result);
 	}
 
+	/**
+	 * 角色列表数据(可用)
+	 * @param role
+	 * @param page
+	 * @return
+	 */
+	@ApiLog("查询角色列表(可用)")
+	@PreAuthorize("hasAuthority('sys:role:list')")
+	@GetMapping("usableDataList")
+	public ResponseEntity<IPage<Role>> usableDataList(Role role, Page<Role> page) throws Exception {
+		QueryWrapper<Role> queryWrapper = QueryWrapperGenerator.buildQueryCondition (role, Role.class);
+		queryWrapper.eq("useable","1");
+		IPage<Role> result = roleService.page (page, queryWrapper);
+		return ResponseEntity.ok (result);
+	}
+
 
 	/**
 	 * 按id查询

+ 1 - 1
jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/centerservice/service/ccpm/CcpmRequest.java

@@ -48,7 +48,7 @@ public class CcpmRequest {
         act.put("comment", comment);
         resp.put("act", act);
         resp.put("createBy", createBy);
-        Object res = restTemplateService.postCCPM("/a/transpond/transpond/saveAuditFunc", token, null, resp);
+        Object res = restTemplateService.postCCPM("/a/transpond/transpond/auditDistribute", token, null, resp);
         return res;
     }
 }

+ 0 - 1
jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/centerservice/utils/ConvertServiceUtil.java

@@ -8,7 +8,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jeeplus.centerservice.dto.flow.NotifyListDTO;
 import com.jeeplus.centerservice.dto.reimbursement.ReimbursementAmountInfo;
 import com.jeeplus.centerservice.dto.reimbursement.ReimbursementDetailInfo;
 import com.jeeplus.centerservice.dto.reimbursement.SaveInfoDto;