Merge branch 'pre'

src/main/java/com/xjrsoft/module/asset/controller/WfAssetManageController.java

@@ -219,20 +219,20 @@ public class WfAssetManageController {
 
     }
 
-    @PostMapping("/select-record-query")
+    @PostMapping("/select-record-export-query")
     @ApiOperation(value = "选中记录导出")
     public ResponseEntity<byte[]> assetManageSelectRecordQuery(@Valid @RequestBody WfAssetManageSelectRecordQueryDto dto) {
-//    @GetMapping("/select-record-query")
+//    @GetMapping("/select-record-export-query")
 //    @ApiOperation(value = "选中记录导出")
 //    public ResponseEntity<byte[]> assetManageSelectRecordQuery(@Valid WfAssetManageSelectRecordQueryDto dto) {
         ByteArrayOutputStream bot = wfAssetManageService.listWfAssetManageSelectRecordQuery(dto);
         return RT.fileStream(bot.toByteArray(), "WfAssetManage" + ExcelTypeEnum.XLSX.getValue());
     }
 
-    @PostMapping("/conditional-search-query")
+    @PostMapping("/conditional-search-export-query")
     @ApiOperation(value = "条件搜索导出")
     public ResponseEntity<byte[]> assetManageConditionalSearchQuery(@Valid @RequestBody WfAssetManageConditionalSearchQueryDto dto) {
-//    @GetMapping("/conditional-search-query")
+//    @GetMapping("/conditional-search-export-query")
 //    @ApiOperation(value = "条件搜索导出")
 //    public ResponseEntity<byte[]> textbookClaimExportQuery(@Valid WfAssetManageConditionalSearchQueryDto dto) {
         ByteArrayOutputStream bot = wfAssetManageService.listWfAssetManageConditionalSearchQuery(dto);

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -398,6 +398,12 @@ public class UserController {
         return RT.ok(userService.resetPassword(dto));
     }
 
+    @PutMapping("/batch-reset-password")
+    @ApiOperation(value = "批量重置密码")
+    public RT<Boolean> batchResetPassword(@RequestBody List<Long> ids) {
+        return RT.ok(userService.batchResetPassword(ids));
+    }
+
     @PostMapping("/bind-unionid")
     @ApiOperation(value = "绑定微信 UnionId")
     public R bindUnionId(@RequestBody BindOpenidDto dto) {

src/main/java/com/xjrsoft/module/organization/service/IUserService.java

@@ -44,6 +44,8 @@ public interface IUserService extends MPJBaseService<User> {
      */
     boolean resetPassword(ResetPasswordDto dto);
 
+    boolean batchResetPassword(List<Long> ids);
+
     /**
      * 绑定微信 Openid
      * @param dto

src/main/java/com/xjrsoft/module/organization/service/impl/UserServiceImpl.java

@@ -234,6 +234,24 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
         return updateById(user);
     }
 
+    @Override
+    public boolean batchResetPassword(List<Long> ids) {
+        for (Long id : ids) {
+            User user = new User();
+            user.setId(id);
+            user.setPassword(BCrypt.hashpw(propertiesConfig.getDefaultPassword(), BCrypt.gensalt()));
+            user.setIsChangePassword(1);
+
+            CompletableFuture.runAsync(() -> {
+                List<User> list = list();
+                redisUtil.set(GlobalConstant.USER_CACHE_KEY, list);
+            });
+            updateById(user);
+        }
+
+        return true;
+    }
+
     @Override
     public boolean bindOpenid(BindOpenidDto dto) {
         User user = this.getOne(Wrappers.<User>query().lambda().select(User::getId, User::getOpenId, User::getUnionId).eq(User::getId, dto.getId()), false);

src/main/java/com/xjrsoft/module/workflow/dto/MyProcessPageDto.java

@@ -53,4 +53,5 @@ public class MyProcessPageDto extends PageInput {
      */
     @ApiModelProperty("类型 1完成 2未完成 ")
     private Integer type;
+
 }

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -3363,8 +3363,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
 
 
             for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {
-
-                //找到当前流程的 任务开始时间 最大值  为当前审批节点
+                //找到当前流程的 任务开始时间 最大值 为当前审批节点
                 workflowExtras.stream()
                         .filter(e -> e.getProcessId().equals(historicProcessInstance.getId()))
                         .max(Comparator.comparing(WorkflowExtra::getStartTime))
@@ -3375,7 +3374,6 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                             vo.setSchemaName(e.getSchemaName());
                             vo.setOriginator(e.getStartUserName());
                             vo.setSchemaId(e.getSchemaId());
-
                             vo.setTaskName(e.getTaskName());
                             vo.setCurrentTaskName(e.getTaskName());
                             vo.setTaskId(e.getTaskId());

src/main/java/com/xjrsoft/module/workflow/vo/MyProcessPageVo.java

@@ -72,4 +72,5 @@ public class MyProcessPageVo {
 
     @ApiModelProperty("是否已审批(0:否 1:是)")
     private Integer isApproval;
+
 }