diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index b3d6abffe..69b474d20 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -128,8 +128,8 @@ public class SysUserController { * @return */ @ApiOperation(value = "用户管理-分页查询") - @RequiresPermissions("sys:user:list") - @PermissionData(pageComponent = "system/UserList") +// @RequiresPermissions("sys:user:list") +// @PermissionData(pageComponent = "system/UserList") @RequestMapping(value = "/page", method = RequestMethod.GET) public Result> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 2bbf14a84..5ea394321 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -226,6 +226,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl delList = new ArrayList<>(); + for (ParamsCollectManifestEO target : paramsCollectManifestEOList) { + boolean isHave = false; + for (ParamsInfoPublishEO source : paramsInfoPublishEOList) { + if (target.getNioNumber().equals(source.getNioNumber())) { + isHave = true; + break; + } + } + if(!isHave){ + delList.add(target.getId()); + } + } + paramsCollectManifestEOService.deleteByIds(delList); }catch (Exception e){ e.printStackTrace(); return false; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 0e3d4a4fc..ac836dd1d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -259,6 +259,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl
-
- +
+ - - -
- -
+ + +
+
+