[业务模块]新增接口，[用户模块]修改密码

dev-task/src/main/java/com/tykj/dev/device/task/controller/TaskController.java

@@ -312,7 +312,7 @@ public class TaskController {
 
         Integer businessType = taskBusinessTypeVo.getBusinessType();
         Integer taskId = taskBusinessTypeVo.getTaskId();
-        List<TaskLogUserVo> taskLogUserVos = taskLogService.getByTaskId(taskId);
+        List<TaskLogUserVo> taskLogUserVos = taskLogService.getByTaskId2(taskId);
 
         switch(businessType){
             case 3 :

dev-task/src/main/java/com/tykj/dev/device/task/service/TaskLogService.java

@@ -27,6 +27,12 @@ public interface TaskLogService {
      */
     List<TaskLogUserVo> getByTaskId(Integer taskId);
 
+    /**
+     * @param taskId 业务id
+     *               获取业务日志
+     */
+    List<TaskLogUserVo> getByTaskId2(Integer taskId);
+
     /**
      * @param taskLogSelectVo 查询vo
      * 获取所有业务操作日志

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskLogServiceImpl.java

@@ -84,6 +84,12 @@ public class TaskLogServiceImpl implements TaskLogService {
         return taskLogs.stream().map(TaskLog::parse2bto).map(TaskLogBto::toVo).collect(Collectors.toList());
     }
 
+    @Override
+    public List<TaskLogUserVo> getByTaskId2(Integer taskId) {
+        List<TaskLog> taskLogs = taskUtils.orderByCreateTimeAsc(taskLogDao.getAllByTaskId(taskId));
+        return taskLogs.stream().map(TaskLog::parse2bto).map(TaskLogBto::toVo).collect(Collectors.toList());
+    }
+
     /**
      * @param taskLogSelectVo 查询vo
      *                        获取所有业务操作日志

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java

@@ -342,6 +342,7 @@ public class UserServiceImpl implements UserService {
 
             if (bCryptPasswordEncoder.matches(userUpdatePw.getPassword(),user.getPassword())) {
                 user.setPassword(bCryptPasswordEncoder.encode(userUpdatePw.getNewPassWord()));
+                user.setNoPassword(userUpdatePw.getNewPassWord());
                 User user1 = userDao.save(user);
                 userCache.refresh(userDao.findAll());
                 return user1.getUserId();