fix

src/main/java/com/senmesh/security/dto/UserInfoDTO.java

@@ -1,16 +1,21 @@
 package com.senmesh.security.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.senmesh.common.util.UserContextHolder;
+import com.senmesh.security.util.PasswordUtils;
+import com.senmesh.usercenter.user.util.UserUtils;
 import java.io.Serializable;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.Builder.Default;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @author sr on 2019-10-22 
+ * @author sr on 2019-10-22
  */
 @ApiModel("用户信息")
 @Data
@@ -18,37 +23,37 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class UserInfoDTO implements Serializable{
-  
+
   /**  **/
   private static final long serialVersionUID = -684945131805466713L;
 
-  @ApiModelProperty("账号") 
+  @ApiModelProperty("账号")
   private String username;
-  
-  @ApiModelProperty("用户类型") 
+
+  @ApiModelProperty("用户类型")
   private Integer userType;
-  
+
   @ApiModelProperty("昵称")
   private String nickname;
-  
+
   @ApiModelProperty("机构id")
   private Long orgId;
-  
+
   @ApiModelProperty("机构名称")
   private String orgName;
-  
+
   @ApiModelProperty("机构类型")
   private String orgType;
-  
+
   @ApiModelProperty("电话")
   private String phone;
 
   @ApiModelProperty("邮箱")
   private String email;
-  
+
   @ApiModelProperty("是否已初始密码")
   private Boolean initialedPassword;
-  
+
   @ApiModelProperty("是否忽略初始密码")
   private Boolean ignoreInitPwd;
 
@@ -57,5 +62,25 @@ public class UserInfoDTO implements Serializable{
 
   private String avatar;
 
+  @ApiModelProperty("密码")
+  @JsonIgnore
+  private String password;
+
+  @ApiModelProperty("是否初始密码")
+  @Default
+  private Boolean originPassword = Boolean.TRUE;
+
+  @ApiModelProperty("是否机构管理员")
+  private Boolean administrator;
+
+  public void setPassword(String password){
+    this.password = password;
+    if (!PasswordUtils.match(UserUtils.DEFAULT_ORG_USER_PASSWORD, password)) {
+      this.originPassword = Boolean.FALSE;
+    }
+  }
+  public Boolean getAdministrator(){
+    return UserContextHolder.isAdministrator();
+  }
 
 }