Browse Source

考勤多打卡详情新增项目名称

anderx 1 year ago
parent
commit
c154ccdf0c

+ 1 - 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -112,6 +112,7 @@ public class SysUserController extends BaseController
         if (StringUtils.isNotNull(userId))
         {
             SysUser sysUser = userService.selectUserById(userId);
+            System.out.println(sysUser.toString());
             ajax.put(AjaxResult.DATA_TAG, sysUser);
             ajax.put("postIds", postService.selectPostListByUserId(userId));
             ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
@@ -149,11 +150,6 @@ public class SysUserController extends BaseController
         return toAjax(userService.insertUser(user));
     }
 
-    public static void main(String[] args) {
-        String s = SecurityUtils.encryptPassword("admin123");
-        System.out.println(s);
-    }
-
 
     /**
      * 查询用户编号

+ 5 - 3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -148,13 +148,13 @@ public class SysUser extends BaseEntity
 
     private Integer projectQuantitySort;
     private Integer durationSort;
-    private Long ddUserId;
+    private String ddUserId;
 
-    public Long getDdUserId() {
+    public String getDdUserId() {
         return ddUserId;
     }
 
-    public void setDdUserId(Long ddUserId) {
+    public void setDdUserId(String ddUserId) {
         this.ddUserId = ddUserId;
     }
 
@@ -517,8 +517,10 @@ public class SysUser extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("ddUserId", getDdUserId())
             .append("dept", getDept())
             .append("roles", getRoles())
+
             .toString();
     }
 }