用户头像更新

pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java

@@ -468,6 +468,8 @@ public enum DicDataEnum {
     USER_MANUAL("使用手册","User_Manual"),
     USER_AGREEMENT("用户协议","User_Agreement"),
     COMPANY_PROFILE("公司简介","Company_Profile"),
+    PERSONAL_INFOR_PROTECT("个人信息保护政策","Personal_Infor_Protect"),
+
     /**
      * app设备事件类型权限转移，数据恢复
      */

pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DictTreeParam.java

@@ -31,24 +31,24 @@ public class DictTreeParam {
      * 名称
      */
     @ApiModelProperty(value = "名称")
+    @NotBlank(message = ValidMessage.NAME_NOT_BLANK)
     private String name;
 
     /**
      * 编码
      */
     @TableField(value = "编码")
+    @NotBlank(message = ValidMessage.CODE_NOT_BLANK)
     private String code;
 
     /**
      * 排序
      */
-    @TableField(value = "sort")
     private Integer sort;
 
     /**
      * 描述
      */
-    @TableField(value = "remark")
     private String remark;
 
 

pqs-system/system-boot/src/main/java/com/njcn/system/controller/UserLogController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 
@@ -70,7 +71,7 @@ public class UserLogController extends BaseController {
                         ServerInfo.CS_REPORT_BOOT,
                         ServerInfo.CS_EVENT_BOOT,
                         ServerInfo.CS_WARN_BOOT,
-                        ServerInfo.CS_SYSTEM_BOOT)).orderByDesc(UserLog::getCreateTime).last("limit 100").list();
+                        ServerInfo.CS_SYSTEM_BOOT).collect(Collectors.toList())).orderByDesc(UserLog::getCreateTime).last("limit 100").list();
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 }