From 93f7335e1a52591662d5d37f41ac352860b2ca2a Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期二, 04 六月 2024 18:39:50 +0800
Subject: [PATCH] 1、对象引用改动。
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java
index e8769f2..b9d65a4 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java
@@ -1,12 +1,12 @@
package com.vci.frameworkcore.enumpck;
import com.alibaba.fastjson.JSONObject;
+import com.vci.client.common.objects.DeptObject;
+import com.vci.client.common.objects.RoleObject;
+import com.vci.client.common.objects.UserObject;
import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
import com.vci.frameworkcore.pagemodel.SmRoleVO;
import com.vci.frameworkcore.pagemodel.SmUserVO;
-import com.vci.rmip.framework.client.systemConfig.object.DeptObject;
-import com.vci.rmip.framework.client.systemConfig.object.RoleObject;
-import com.vci.rmip.framework.client.systemConfig.object.UserObject;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
@@ -81,7 +81,7 @@
smUserVO.setPkPasswordStrategy(null);//鎵�灞炲瘑鐮佸畨鍏ㄧ瓥鐣�
smUserVO.setPkPasswordStrategyName(null);//鎵�灞炲瘑鐮佸畨鍏ㄧ瓥鐣�
smUserVO.setLastLoginTime(null);//鏈�鍚庣櫥褰曟椂闂�
- smUserVO.setLastModifyPasswordTime(ChangeStrToDate(userObject.getPwdUpdateTime()));//鏈�鍚庝慨鏀瑰瘑鐮佹槸鍑�
+ smUserVO.setLastModifyPasswordTime(new Date(userObject.getPwdUpdateTime()));//鏈�鍚庝慨鏀瑰瘑鐮佹槸鍑�
smUserVO.setPwdWrongCount(0);//瀵嗙爜閿欒娆℃暟
smUserVO.setSex(null);//鎬у埆
smUserVO.setSexText(null);//鎬у埆鏄剧ず鍚嶇О
@@ -91,9 +91,9 @@
smUserVO.setPhoto(null);//澶村儚
//smUserVO.setSecretGrade(userObject.getSecretGrade());
smUserVO.setCreator(userObject.getCreateUser());//鍒涘缓鑰�
- smUserVO.setCreateTime(ChangeStrToDate(userObject.getCreateTime()));//鍒涘缓鏃堕棿
+ smUserVO.setCreateTime(ChangeStrToDate(String.valueOf(new Date(userObject.getCreateTime()))));//鍒涘缓鏃堕棿
smUserVO.setLastModifier(userObject.getUpdateUser());//淇敼鑰�
- smUserVO.setLastModifyTime(ChangeStrToDate(userObject.getUpdateTime()));//淇敼鏃堕棿
+ smUserVO.setLastModifyTime(new Date(userObject.getUpdateTime()));//淇敼鏃堕棿
return smUserVO;
}
public OrgDepartmentVO[] changeDeptObjectToOrgDepartmentVOs(DeptObject[] deptObjects){
@@ -115,13 +115,13 @@
departmentVOs.setPkFatherDepartment(deptObject.getParentId());
departmentVOs.setDescription(deptObject.getDescription());
departmentVOs.setCreator(deptObject.getCreateUser());
- departmentVOs.setCreateTime(ChangeStrToDate(deptObject.getCreateTime()));
+ departmentVOs.setCreateTime(new Date(deptObject.getCreateTime()));
departmentVOs.setLastModifier(deptObject.getUpdateUser());
- departmentVOs.setLastModifyTime(ChangeStrToDate(deptObject.getUpdateTime()));
+ departmentVOs.setLastModifyTime(new Date(deptObject.getUpdateTime()));
departmentVOs.setLcStatus(deptObject.getStatus()+"");
return departmentVOs;
}
- public SmRoleVO[] changeRoleObjectToSmRoleVOs(RoleObject[] objects){
+ public <RoleObject> SmRoleVO[] changeRoleObjectToSmRoleVOs(com.vci.client.common.objects.RoleObject[] objects){
SmRoleVO[] smRoleVOs=new SmRoleVO[objects.length];
for (int i=0;i<objects.length;i++) {
@@ -135,10 +135,10 @@
smRoleVO.setName(object.getName());
smRoleVO.setDescription(object.getDescription());
smRoleVO.setCreator(object.getCreateUser());
- smRoleVO.setCreateTime(ChangeStrToDate(object.getCreateTime()));
+ smRoleVO.setCreateTime(new Date(object.getCreateTime()));
smRoleVO.setLastModifier(object.getUpdateUser());
smRoleVO.setBtmname("plrole");
- smRoleVO.setLastModifyTime(ChangeStrToDate(object.getUpdateTime()));
+ smRoleVO.setLastModifyTime(new Date(object.getUpdateTime()));
return smRoleVO;
}
--
Gitblit v1.9.3