diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
index e681eff..7cc0f99 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
@@ -121,17 +121,18 @@
 
     static SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-    public static ToiletCleanDto ConvertToDto(ToiletClean toiletClean, IToiletService iToiletService){
-        ToiletCleanDto toiletCleanDto=new ToiletCleanDto();
+    public static ToiletCleanDto ConvertToDto(ToiletClean toiletClean, IToiletService iToiletService) {
+        ToiletCleanDto toiletCleanDto = new ToiletCleanDto();
 
-        toiletCleanDto.setId(toiletClean.getId()==null?null:toiletClean.getId());
-        toiletCleanDto.setToiletId(toiletClean.getToiletId()==null?null:toiletClean.getToiletId());
-        if(toiletClean.getToiletId()!=null&&iToiletService.selectById(toiletClean.getId())!=null)
-            toiletCleanDto.setToiletName(iToiletService.selectById(toiletClean.getId()).getName());
-        toiletCleanDto.setLng(toiletClean.getLng()==null?"":toiletClean.getLng().toString());
-        toiletCleanDto.setLat(toiletClean.getLat()==null?"":toiletClean.getLat().toString());
-        toiletCleanDto.setUpdateTime(toiletClean.getUpdateTime()==null?"":dft.format(toiletClean.getUpdateTime()));
-        toiletCleanDto.setCreateTime(toiletClean.getCreateTime()==null?"":dft.format(toiletClean.getCreateTime()));
+        toiletCleanDto.setId(toiletClean.getId() == null ? null : toiletClean.getId());
+        toiletCleanDto.setToiletId(toiletClean.getToiletId() == null ? null : toiletClean.getToiletId());
+        if (toiletClean.getToiletId() != null && iToiletService.selectById(toiletClean.getId()) != null) {
+            toiletCleanDto.setToiletName(iToiletService.selectById(toiletClean.getToiletId()).getName());
+        }
+        toiletCleanDto.setLng(toiletClean.getLng() == null ? "" : toiletClean.getLng().toString());
+        toiletCleanDto.setLat(toiletClean.getLat() == null ? "" : toiletClean.getLat().toString());
+        toiletCleanDto.setUpdateTime(toiletClean.getUpdateTime() == null ? "" : dft.format(toiletClean.getUpdateTime()));
+        toiletCleanDto.setCreateTime(toiletClean.getCreateTime() == null ? "" : dft.format(toiletClean.getCreateTime()));
         toiletCleanDto.setDefFlag(toiletClean.getDeLFlag());
         toiletCleanDto.setPhoto(toiletClean.getPhoto());
         toiletCleanDto.setUserId(toiletClean.getUserId());
@@ -140,11 +141,11 @@
         return toiletCleanDto;
     }
 
-    public static List<ToiletCleanDto> ConvertToDtoList(List<ToiletClean> toiletCleanList,IToiletService iToiletService){
-        List<ToiletCleanDto> toiletCleanDtoList=new ArrayList<>();
+    public static List<ToiletCleanDto> ConvertToDtoList(List<ToiletClean> toiletCleanList, IToiletService iToiletService) {
+        List<ToiletCleanDto> toiletCleanDtoList = new ArrayList<>();
 
-        for (ToiletClean toiletClean:toiletCleanList){
-            toiletCleanDtoList.add(ConvertToDto(toiletClean,iToiletService));
+        for (ToiletClean toiletClean : toiletCleanList) {
+            toiletCleanDtoList.add(ConvertToDto(toiletClean, iToiletService));
         }
 
         return toiletCleanDtoList;