yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:36057f3126e1092796323f8619c58a9c7a366ec8
Branches Tags
yangjun:master
..
compare: yangjun:7cc33aa9379fbaea465d9c9d511d6f4961bf176c
Branches Tags
yangjun:master

No commits in common. "36057f3126e1092796323f8619c58a9c7a366ec8" and "7cc33aa9379fbaea465d9c9d511d6f4961bf176c" have entirely different histories.
36057f3126 ... 7cc33aa937

2 changed files with 105 additions and 112 deletions
Show Stats Expand all files Collapse all files

1
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java
View File

@ -331,7 +331,6 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
QueryWrapper<KcKechengbiao> kcKechengbiaoQueryWrapper = new QueryWrapper<>(); QueryWrapper<KcKechengbiao> kcKechengbiaoQueryWrapper = new QueryWrapper<>();
kcKechengbiaoQueryWrapper.eq("rwbh",rwbh); kcKechengbiaoQueryWrapper.eq("rwbh",rwbh);
kcKechengbiaoQueryWrapper.eq("xqxn",xqxn); kcKechengbiaoQueryWrapper.eq("xqxn",xqxn);
kcKechengbiaoQueryWrapper.eq("flag","0");
kcKechengbiaoQueryWrapper.last("limit 1"); kcKechengbiaoQueryWrapper.last("limit 1");
KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper);
return Result.OK(kcKechengbiao); return Result.OK(kcKechengbiao);

14
jeecg-module-main/src/main/java/org/jeecg/modules/wps/controller/WpsController.java
View File

@ -48,7 +48,6 @@ public class WpsController extends JeecgController<KcCasusers, IKcCasusersServic
/** /**
* 文档预览 * 文档预览
*
* @param fileId * @param fileId
* @return * @return
*/ */
@ -76,7 +75,6 @@ public class WpsController extends JeecgController<KcCasusers, IKcCasusersServic
/** /**
* 文件下载地址 * 文件下载地址
*
* @param fileId * @param fileId
* @return * @return
*/ */
@ -95,13 +93,11 @@ public class WpsController extends JeecgController<KcCasusers, IKcCasusersServic
/** /**
* 获取文档用户权限 * 获取文档用户权限
*
* @param fileId * @param fileId
* @return * @return
*/ */
@RequestMapping(value = "/files/{fileId}/permission", method = {RequestMethod.GET}) @RequestMapping(value = "/files/{fileId}/permission", method = {RequestMethod.GET})
public Map<String, Object> permission(@PathVariable("fileId") String fileId, public Map<String,Object> permission(@PathVariable("fileId") String fileId) {
@RequestHeader(value = "X-WebOffice-Token", required = false) String webOfficeToken) {
ZyInfoStudent zyInfoStudent = zyInfoStudentService.getById(fileId); ZyInfoStudent zyInfoStudent = zyInfoStudentService.getById(fileId);
Map<String,Object> mapRet = new HashMap<>(); Map<String,Object> mapRet = new HashMap<>();
Map<String,Object> mapRet2 = new HashMap<>(); Map<String,Object> mapRet2 = new HashMap<>();
@ -114,9 +110,9 @@ public class WpsController extends JeecgController<KcCasusers, IKcCasusersServic
mapRet2.put("read",1); mapRet2.put("read",1);
// mapRet2.put("rename",1); // mapRet2.put("rename",1);
// mapRet2.put("saveas",1); // mapRet2.put("saveas",1);
mapRet2.put("update", webOfficeToken.equals(zyInfoStudent.getCreateBy()) ? 0 : 1); mapRet2.put("update",1);
// mapRet2.put("user_id",zyInfoStudent.getCreateBy()); mapRet2.put("user_id",zyInfoStudent.getCreateBy());
mapRet2.put("user_id", webOfficeToken);
mapRet.put("data",mapRet2); mapRet.put("data",mapRet2);
return mapRet; return mapRet;
} }
@ -124,7 +120,6 @@ public class WpsController extends JeecgController<KcCasusers, IKcCasusersServic
/** /**
* 文档预览 * 文档预览
*
* @param fileId * @param fileId
* @return * @return
*/ */
@ -174,7 +169,6 @@ public class WpsController extends JeecgController<KcCasusers, IKcCasusersServic
/** /**
* 准备上传阶段 * 准备上传阶段
*
* @param fileId * @param fileId
* @return * @return
*/ */