修改个人显示

eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java

@@ -6,6 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 /**
  * @author Zheng Jie
@@ -19,9 +20,9 @@ public class BaseDTO  implements Serializable {
 
     private String updateBy;
 
-    private Timestamp createTime;
+    private LocalDateTime createTime;
 
-    private Timestamp updateTime;
+    private LocalDateTime updateTime;
 
     @Override
     public String toString() {

eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java

@@ -30,6 +30,7 @@ import javax.persistence.MappedSuperclass;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 /**
  * 通用字段， is_del 根据需求自行添加
@@ -55,12 +56,12 @@ public class BaseEntity implements Serializable {
     @CreationTimestamp
     @Column(name = "create_time", updatable = false)
     @ApiModelProperty(value = "创建时间", hidden = true)
-    private Timestamp createTime;
+    private LocalDateTime createTime;
 
     @UpdateTimestamp
     @Column(name = "update_time")
     @ApiModelProperty(value = "更新时间", hidden = true)
-    private Timestamp updateTime;
+    private LocalDateTime updateTime;
 
     /* 分组校验 */
     public @interface Create {}

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/UserController.java

@@ -39,6 +39,8 @@ import me.zhengjie.dao.mybatis.mapper.NotaryOfficeMapper;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.utils.RsaUtils;
 import me.zhengjie.utils.enums.CodeEnum;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -87,14 +89,18 @@ public class UserController {
         UserDto nocacheUser = userService.findUserNoCacheId(jwtUserDto.getUser().getId());
         // 重新设置user
         if (nocacheUser != null) {
-            String[] split = nocacheUser.getOrgId().split("_");
-            if ("bank".equals(split[0])) {
-                nocacheUser.setOrgName(bankMapper.selectById(split[1]).getBankName());
-            } else {
-                NotaryOfficeEntity notaryOfficeEntity = notaryOfficeMapper.selectById(split[1]);
-                nocacheUser.setOrgName(notaryOfficeEntity.getName());
-                nocacheUser.setAutoGenerate(notaryOfficeEntity.getAutoGenerate());
-            }
+        	//处理客户经理和公证处才执行这里
+        	if(StringUtils.isNotBlank(nocacheUser.getOrgId())) {
+        		   String[] split = nocacheUser.getOrgId().split("_");
+                   if ("bank".equals(split[0])) {
+                       nocacheUser.setOrgName(bankMapper.selectById(split[1]).getBankName());
+                   }else if ("notary".equals(split[0]))  {
+                       NotaryOfficeEntity notaryOfficeEntity = notaryOfficeMapper.selectById(split[1]);
+                       nocacheUser.setOrgName(notaryOfficeEntity.getName());
+                       nocacheUser.setAutoGenerate(notaryOfficeEntity.getAutoGenerate());
+                   }
+        	}
+         
             FileInfoEntity fileInfo = fileInfoService.getById(nocacheUser.getSignImgId());
             if (fileInfo != null) {
                 nocacheUser.setSignImgUrl(FileUploadUtil.getFileUrl(fileInfo.getPath()));

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/UserServiceImpl.java

@@ -51,6 +51,7 @@ import javax.validation.constraints.NotBlank;
 import java.io.File;
 import java.io.IOException;
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -119,7 +120,7 @@ public class UserServiceImpl implements UserService {
             // 无法用BeanCopy的字段赋值
             long milli = userEntityMap.get(item.getUserId()).getCreateTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
             item.setId(item.getUserId());
-            item.setCreateTime(new Timestamp(milli));
+            item.setCreateTime(LocalDateTime.now());
             item.setEnabled(1 == userEntityMap.get(item.getUserId()).getEnabled());
             // 公司名称
             if (!org.springframework.util.StringUtils.isEmpty(item.getOrgId())) {

eladmin-system/src/main/java/me/zhengjie/application/bank/controller/vo/OrderDetailDto.java

@@ -128,7 +128,7 @@ public class OrderDetailDto {
 	private List<String> otherUploadUrl;
 	// 共同责任标记（0：非共同，1：共同）
 	private Integer jointFlag;
-	private String jointIdcard; // '共同责任人身份证号码',
+	private String jointIdCard; // '共同责任人身份证号码',
 	private String jointName; // '共同责任人姓名',
 	private String jointPhone;// '共同责任人手机号',
 	private String jointIdcardFrontPic; // '共同责任人身份证正面照片',

eladmin-system/src/main/resources/config/application.yml

@@ -3,7 +3,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
   data: