From 4e811ec71dba161e13592828a6035e9316b1548e Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 30 八月 2024 17:15:29 +0800
Subject: [PATCH] 链接类型查询模板
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java | 424 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 262 insertions(+), 162 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
index 3bce07c..6a52208 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
@@ -1,5 +1,6 @@
package com.vci.frameworkcore.compatibility.impl;
+import com.vci.dto.SmUserDTO;
import com.vci.common.util.ThreeDES;
import com.vci.corba.common.PLException;
import com.vci.corba.common.data.UserEntityInfo;
@@ -9,14 +10,13 @@
import com.vci.frameworkcore.compatibility.SmPwdStrategyQueryServiceI;
import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.model.dto.SmUserDTO;
-import com.vci.frameworkcore.model.SmUserDO;
-import com.vci.frameworkcore.model.po.SmUserPO;
-import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
-import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
-import com.vci.frameworkcore.pagemodel.SmRoleVO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
-import com.vci.frameworkcore.properties.ConfigReader;
+import com.vci.model.SmUserDO;
+import com.vci.pagemodel.SmUserVO;
+import com.vci.po.SmUserPO;
+import com.vci.pagemodel.OrgDepartmentVO;
+import com.vci.pagemodel.SmPasswordStrategyVO;
+import com.vci.pagemodel.SmRoleVO;
+import com.vci.frameworkcore.properties.ConfigCorbaReader;
import com.vci.omd.utils.ObjectTool;
import com.vci.starter.poi.bo.ReadExcelOption;
import com.vci.starter.poi.bo.WriteExcelData;
@@ -117,12 +117,12 @@
/**
* 蹇呭～鍒�
*/
- private ArrayList<Integer> ColumnNameisRed = new ArrayList<Integer>();
+ private List<Integer> ColumnNameisRed = new ArrayList<Integer>();
/**
* 鐢ㄦ埛鍒嗛〉鏌ヨ鏃惰幏鍙栭儴闂ㄦ斁鍒拌繖閲岄伩鍏嶉噸澶嶆煡璇�
*/
- private Map<String,List<OrgDepartmentVO>> orgDepartmentVOMap;
+ private Map<String,Map<String,String>> orgDepartmentVOMap;
/**
* 鐢ㄦ埛鍒嗛〉鏌ヨ鏃惰幏鍙栬鑹叉斁鍒拌繖閲岄伩鍏嶉噸澶嶆煡璇�
@@ -183,7 +183,7 @@
* @return 鐢ㄦ埛鐨勪俊鎭�
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- private SmUserVO getUserByField(String queryField,String queryValue) throws VciBaseException{
+ private SmUserVO getUserByField(String queryField, String queryValue) throws VciBaseException{
VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(null, SmUserDO.class,null,true);
queryWrapper.eq(queryWrapper.getTableNick() + "." +queryField,queryValue);
queryWrapper.setDistinct(true);
@@ -320,22 +320,21 @@
smUserVO.setEmail(userInfo.email);
smUserVO.setStatus(userInfo.status);
smUserVO.setPassword(userInfo.pwd);
+ smUserVO.setConfirmPassword(userInfo.pwd);
//鐢ㄦ埛鎵�灞為儴闂ㄧ殑鏌ヨ璁剧疆
- List<OrgDepartmentVO> orgDepartmentVOList;
+ Map<String,String> orgDepartmentVOList;
//鏌ョ湅鍏ㄥ眬鍙橀噺涓槸鍚﹀瓨鍦ㄩ儴闂ㄤ俊鎭紝瀛樺湪鐨勬儏鍐垫渶涓昏鏄拡瀵瑰鏉＄敤鎴锋煡璇㈢殑鏃跺�欓伩鍏嶉噸澶嶆煡璇㈢殑
if(Func.isNotEmpty(orgDepartmentVOMap)){
- orgDepartmentVOList = orgDepartmentVOMap.get(userInfo.id);
+ orgDepartmentVOList = Func.isNotEmpty(orgDepartmentVOMap.get(userInfo.id)) ?
+ orgDepartmentVOMap.get(userInfo.id):new HashMap<>();
}else {
- orgDepartmentVOList = orgDeptQueryService.listDeptByUserOid(userInfo.id,null);
+ Map<String, Map<String, String>> tempDeptMap = orgDeptQueryService.batchMapDeptNameByUserOids(Arrays.asList(userInfo.id), null);
+ orgDepartmentVOList = Func.isNotEmpty(tempDeptMap.get(userInfo.id)) ?
+ tempDeptMap.get(userInfo.id):new HashMap<>();
}
- smUserVO.setPkDepartment(
- Func.isEmpty(orgDepartmentVOList) ?
- null:orgDepartmentVOList.stream().map(OrgDepartmentVO::getOid).collect(Collectors.joining(","))
- );
- smUserVO.setPkDepartmentName(
- Func.isEmpty(orgDepartmentVOList) ?
- null:orgDepartmentVOList.stream().map(OrgDepartmentVO::getName).collect(Collectors.joining(","))
- );
+ //閮ㄩ棬oid锛屾甯告儏鍐典笅涓�涓敤鎴峰彧浼氬瓨鍦ㄤ竴涓儴闂ㄤ笅
+ smUserVO.setPkDepartment(orgDepartmentVOList.keySet().stream().collect(Collectors.joining(",")));
+ smUserVO.setPkDepartmentName(orgDepartmentVOList.values().stream().collect(Collectors.joining(",")));
//瀵嗙爜绛栫暐鏌ヨ璁剧疆
SmPasswordStrategyVO smPasswordStrategyVO;
if(Func.isNotEmpty(smPwdStrategyVOMap)){
@@ -508,19 +507,6 @@
}
/**
- * 鑾峰彇鐢ㄦ埛鐨勫垪琛紝榛樿浼氫互鐢ㄦ埛鍚嶅崌搴忔帓鍒楋紝鐢ㄦ埛鐨勭紪杈戦〉闈㈠垪琛ㄤ笉瑕佷娇鐢ㄨ繖涓帴鍙�
- * @param queryMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴忕殑淇℃伅锛屽湪鍏煎鑰佸钩鍙扮殑鏃跺�欎細鑷姩鍏煎锛屽鏋滃睘鎬т笉瀛樺湪浼氳嚜鍔ㄥ拷鐣�
- * @return 鐢ㄦ埛鐨勬樉绀哄璞″垪琛�
- * @throws VciBaseException 鍙傛暟涓虹┖鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<SmUserVO> gridUsers(Map<String, String> queryMap,
- PageHelper pageHelper) throws VciBaseException {
- return gridUserByQueryField(null,null,queryMap,pageHelper,false);
- }
-
- /**
* 鐢ㄦ埛绠＄悊鐣岄潰鍒嗛〉鏌ヨ
* @param conditionMap 鏌ヨ鏉′欢
* @param pageHelper 鍒嗛〉鍙傛暟
@@ -532,8 +518,8 @@
pageHelper = new PageHelper(-1);
}
pageHelper.addDefaultAsc("PLTRUENAME");
- //TODO:涓轰簡鏂逛究璋冭瘯锛屾墍浠ヨ繖鍎垮厛娉ㄩ噴鍐欐鍚庨潰璁板緱鏇存敼
String loginUserId = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
+ //String loginUserId = "Ludc";
//鍒嗛〉鏌ヨ
UserInfo[] userInfos = platformClientUtil.getFrameworkService().fetchUserInfoByCondition(
conditionMap.get("name"),
@@ -547,10 +533,11 @@
DataGrid<SmUserVO> dataGrid = new DataGrid<>();
if(Func.isNotEmpty(userInfos)){
List<String> idList = Arrays.stream(userInfos).map(item -> item.id).collect(Collectors.toList());
- orgDepartmentVOMap = orgDeptQueryService.batchListDeptByUserOids(idList, null);
+ orgDepartmentVOMap = orgDeptQueryService.batchMapDeptNameByUserOids(idList, null);
smRoleVOMap = smRoleQueryService.batchListRoleByUserOids(idList,null);
smPwdStrategyVOMap = smPwdStrategyQueryService.batchSmPwdStrategyByUserOids(idList);
dataGrid.setData(userInfoArr2VO(userInfos));
+ //TODO: 杩欎釜缁熻鎬绘暟鏈夐棶棰橈紝甯﹁繃鍘荤殑鍙傛暟涓嶈兘鍍忎笂闈㈤偅涓猣etchUserInfoByCondition鏌ヨ涓�鏍风粺璁″鍗寸殑鎬绘暟
dataGrid.setTotal(
platformClientUtil.getFrameworkService().getUserTotalByCondition(
conditionMap.get("name"),
@@ -607,24 +594,128 @@
return userVO.getName();
}
+ /**
+ * 缁熻閮ㄩ棬涓嬬殑鐢ㄦ埛锛氬寘鍚瓙閮ㄩ棬涓嬬殑鐢ㄦ埛
+ * @param deptOid
+ * @param queryMap
+ * @return
+ * @throws VciBaseException
+ */
+ @Override
+ public List<SmUserVO> countSmUserByDeptOid(String deptOid, Map<String, String> queryMap) throws VciBaseException {
+ //鏄惁鏌ヨ瀛愰儴闂ㄤ笅鍏宠仈鐨勭敤鎴�
+ List<OrgDepartmentVO> orgDepartmentVOList = orgDeptQueryService.listAllLevelChildrenDeptByParentOid(deptOid, null);
+ List<String> deptOidCollection = orgDepartmentVOList.stream().map(OrgDepartmentVO::getOid).collect(Collectors.toList());
+ deptOidCollection.add(deptOid);//灏嗗綋鍓嶅眰鐨刼id涔熸斁杩涘幓
+ List<SmUserVO> smUserVOList = listUserVOByDeptOid(queryMap, deptOidCollection, false);
+ if(Func.isEmpty(smUserVOList)){
+ return new ArrayList<>();
+ }
+ Map<String, List<SmRoleVO>> smRoleVOMap = smRoleQueryService.batchListRoleByUserOids(smUserVOList.stream().map(SmUserVO::getOid).collect(Collectors.toSet()), null);
+ smUserVOList = smUserVOList.stream().map(vo->{
+ List<SmRoleVO> smRoleVOS = smRoleVOMap.get(vo.getOid());
+ vo.setPkPerson(
+ Func.isEmpty(smRoleVOS) ?
+ null:smRoleVOS.stream().map(SmRoleVO::getOid).collect(Collectors.joining(","))
+ );
+ vo.setPkPersonName(
+ Func.isEmpty(smRoleVOS) ?
+ null:smRoleVOS.stream().map(SmRoleVO::getName).collect(Collectors.joining(","))
+ );
+ return vo;
+ }).collect(Collectors.toList());
+ return smUserVOList;
+ }
+
/**
- * 鏌ヨ鏌愪釜閮ㄩ棬涓嬬殑鐢ㄦ埛瀵硅薄
+ * 鏌ヨ鍦ㄦ煇涓儴闂ㄤ笅鐨勭敤鎴峰璞�
* @param deptOid 閮ㄩ棬鐨勪富閿�
* @param queryMap 鏌ヨ鏉′欢锛屽鏋滄槸閮ㄩ棬鐨勬煇涓睘鎬т綔涓烘煡璇㈡潯浠讹紝鍒欏彲浠ヤ娇鐢╬kDepartment.xxx杩欐牱鐨勬柟寮�
* @return 鐢ㄦ埛鐨勬樉绀哄璞″垪琛�
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
@Override
- public List<SmUserVO> listUserByDeptOid(String deptOid,
- Map<String, String> queryMap) throws VciBaseException {
- if(StringUtils.isBlank(deptOid)){
- return new ArrayList<>();
- }
- return listUserByQueryField(QUERY_FIELD_DEPARTMENT,deptOid,queryMap,false);
+ public List<SmUserVO> listUserByDeptOid(String deptOid, Map<String, String> queryMap) throws VciBaseException {
+ //鏌ヨ褰撳墠閫変腑鐨勯儴闂ㄤ笅鐨勭敤鎴�
+ return listUserVOByDeptOid(queryMap,Arrays.asList(deptOid),false );
}
/**
- * 鑾峰彇鏌ヨ灏佽鍣紝榛樿鍙煡浜唒lstatus=0鍜宲lusertype=2锛屾帓搴忛粯璁lusername
+ * 鏌ヨ涓嶅湪鏌愪釜閮ㄩ棬涓嬬殑鐢ㄦ埛瀵硅薄鍒楄〃
+ * @param deptOid 閮ㄩ棬鐨勪富閿�
+ * @param queryMap 鏌ヨ鏉′欢锛屽鏋滄槸閮ㄩ棬鐨勬煇涓睘鎬т綔涓烘煡璇㈡潯浠讹紝鍒欏彲浠ヤ娇鐢╬kDepartment.xxx杩欐牱鐨勬柟寮�
+ * @return 鐢ㄦ埛鐨勬樉绀哄璞″垪琛紝榛樿浣跨敤鐢ㄦ埛鍚嶅崌搴忔帓鍒�
+ * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
+ */
+ @Override
+ public List<SmUserVO> listUserUnInDeptOid(String deptOid, Map<String, String> queryMap) throws VciBaseException {
+ // TODO:鏍规嵁褰撳墠鐧诲綍鐨勭敤鎴峰喅瀹氳兘鏌ラ偅浜涚敤鎴�
+ String userType = "0";//WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUsertype();
+ //鏍规嵁褰撳墠鐧诲綍鐨勭敤鎴风被鍨嬩笉鍚岋紝鏌ヨ涓嶅悓鐨勭敤鎴�
+ if(UserTypeEnum.SUPPER_ADMIN.getValue().equals(userType)){
+ //瓒呯鐢ㄦ埛鍙兘鏌ョ鐞嗗憳鐢ㄦ埛
+ queryMap.put("plusertype", "1");
+ }else{
+ //闄や簡瓒呯閮藉彧鑳芥煡鏅�氱敤鎴�
+ queryMap.put("plusertype", "2");
+ }
+ return listUserVOByDeptOid(queryMap,Arrays.asList(deptOid),true);
+ }
+
+ /**
+ * 鐢ㄦ埛鏍规嵁閮ㄩ棬鏌ヨ鐨勭粺涓�鏂规硶
+ * @param conditionMap 鏌ヨ鏉′欢
+ * @param deptOidList 閮ㄩ棬涓婚敭
+ * @param notIn true寰呴�夛紝false宸查��
+ * @return
+ */
+ private List<SmUserVO> listUserVOByDeptOid(Map<String,String> conditionMap/*鏀剧疆鏌ヨ鏉′欢*/,List<String> deptOidList,boolean notIn){
+ //鍏堟煡璇㈠凡閫変汉鍛榦id
+ List<String> userOidList = new ArrayList<>();
+ WebUtil.switchCollectionForOracleIn(deptOidList).stream().forEach(deptOids->{
+ String sql = "select pluseruid,pldeptuid from pluserdept where pldeptuid in (" + WebUtil.toInSql(deptOids.toArray(new String[0])) + ")";
+ List<BusinessObject> cbos = boService.queryBySql(sql, null);
+ //閬嶅巻鍑虹敤鎴蜂富閿�
+ cbos.stream().forEach(cbo->{
+ userOidList.add(ObjectTool.getNewBOAttributeValue(cbo,"pluseruid"));
+ });
+ });
+ //鏍规嵁鐢ㄦ埛oid鏌ヨ鐢ㄦ埛
+ VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(conditionMap, SmUserDO.class);
+ //娣诲姞杩炶〃鏌ヨ鏉′欢
+ queryWrapperForDO.setLinkTableSql(" left join pluserdept up on " + queryWrapperForDO.getTableNick() + ".pluid = up.pluseruid" +
+ " left join pldept pkDepartment on up.pldeptuid = pkDepartment.pluid " +
+ " left join PLUSERPASSWORDSTRATEGY pkUserPassword on " +queryWrapperForDO.getTableNick() + ".pluid = pkUserPassword.pluseruid ");
+ queryWrapperForDO.setOrderSql("order by " + queryWrapperForDO.getTableNick() + ".pltrueName");
+ List<SmUserDO> smUserDOList = new ArrayList<>();
+ //userOidList涓虹┖鏃剁殑涓ょ鎯呭喌
+ if(Func.isEmpty(userOidList)){
+ //濡傛灉鏄凡閫夋煡璇㈣鏄庡凡閫変负绌虹洿鎺ヨ繑鍥炵┖
+ if(!notIn){
+ return new ArrayList<>();
+ }
+ //涓嶆槸宸查�夋煡璇㈣鏄庡緟閫変负绌猴紝鐩存帴鏌ヨ鐢ㄦ埛
+ smUserDOList.addAll(boService.selectByQueryWrapper(queryWrapperForDO, SmUserDO.class));
+ }else{
+ //宸查�夋煡璇紝鎴栧緟閫夋煡璇紝浣嗘槸璇ラ儴闂ㄥ瓨鍦ㄧ浉鍏抽厤缃�
+ WebUtil.switchCollectionForOracleIn(userOidList).stream().forEach(userOids->{
+ //鏌ヨ涓嶅湪鑼冨洿鍐呯殑锛氬緟閫変汉鍛�
+ if(notIn){
+ queryWrapperForDO.notIn(queryWrapperForDO.getTableNick()+".pluid",WebUtil.toInSql(userOids.toArray(new String[0])));
+
+ }else{
+ //宸查�変汉鍛樺拰缁熻
+ queryWrapperForDO.in(queryWrapperForDO.getTableNick()+".pluid",WebUtil.toInSql(userOids.toArray(new String[0])));
+ }
+ smUserDOList.addAll(boService.selectByQueryWrapper(queryWrapperForDO, SmUserDO.class));
+ });
+ }
+ return smUserDO2VOs(smUserDOList);
+ }
+
+ /**
+ * 鑾峰彇鏌ヨ灏佽鍣紝榛樿鍙煡浜唒lstatus=0鍜宲lusertype=2锛堟敼鎴愭牴鎹綋鍓嶇櫥褰曠殑鐢ㄦ埛鏉ュ喅瀹氭煡浠�涔堢被鍨嬬殑鐢ㄦ埛锛夛紝
+ * 鎺掑簭榛樿plusername
* @param queryField 鏌ヨ灞炴��
* @param queryValue 鏌ヨ鐨勫��
* @param queryMap 鏌ヨ鏉′欢锛屽鏋滄槸瑙掕壊鐨勫睘鎬э紝闇�瑕佷娇鐢╬krole.xxx
@@ -655,24 +746,17 @@
}
addRoleQuerySql(queryMap,queryWrapperForDO);
queryWrapperForDO.eq("plstatus", "0");
- queryWrapperForDO.eq("plusertype", "2");
- queryWrapperForDO.setDistinct(true);
+ // TODO:鏍规嵁褰撳墠鐧诲綍鐨勭敤鎴峰喅瀹氳兘鏌ラ偅浜涚敤鎴�
+ SessionInfo loginUser = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
+ //鏍规嵁褰撳墠鐧诲綍鐨勭敤鎴风被鍨嬩笉鍚岋紝鏌ヨ涓嶅悓鐨勭敤鎴�
+ if(UserTypeEnum.SUPPER_ADMIN.getValue().equals(loginUser.getUsertype())){
+ //瓒呯鐢ㄦ埛鍙兘鏌ョ鐞嗗憳鐢ㄦ埛
+ queryMap.put("plusertype", "1");
+ }else{
+ //闄や簡瓒呯閮藉彧鑳芥煡鏅�氱敤鎴�
+ queryMap.put("plusertype", "2");
+ }
return queryWrapperForDO;
- }
-
- /**
- * 鏌ヨ鏌愪釜閮ㄩ棬涓嬬殑鐢ㄦ埛瀵硅薄鍒楄〃
- * @param deptOid 閮ㄩ棬鐨勪富閿�
- * @param queryMap 鏌ヨ鏉′欢锛屽鏋滄槸閮ㄩ棬鐨勬煇涓睘鎬т綔涓烘煡璇㈡潯浠讹紝鍒欏彲浠ヤ娇鐢╬kDepartment.xxx杩欐牱鐨勬柟寮�
- * @param pageHelper 鍒嗛〉鍜屾帓搴忎俊鎭紝榛樿浣跨敤鐢ㄦ埛鍚嶅崌搴忔帓鍒�
- * @return 鐢ㄦ埛鐨勬樉绀哄璞″垪琛紝榛樿浣跨敤鐢ㄦ埛鍚嶅崌搴忔帓鍒�
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<SmUserVO> gridUserByDeptOid(String deptOid,
- Map<String, String> queryMap, PageHelper pageHelper)
- throws VciBaseException {
- return gridUserByQueryField(QUERY_FIELD_DEPARTMENT,deptOid,queryMap,pageHelper,false);
}
/**
@@ -695,37 +779,6 @@
}
/**
- * 鏌ヨ涓嶅湪鏌愪釜閮ㄩ棬涓嬬殑鐢ㄦ埛瀵硅薄鍒楄〃
- * @param deptOid 閮ㄩ棬鐨勪富閿�
- * @param queryMap 鏌ヨ鏉′欢锛屽鏋滄槸閮ㄩ棬鐨勬煇涓睘鎬т綔涓烘煡璇㈡潯浠讹紝鍒欏彲浠ヤ娇鐢╬kDepartment.xxx杩欐牱鐨勬柟寮�
- * @return 鐢ㄦ埛鐨勬樉绀哄璞″垪琛紝榛樿浣跨敤鐢ㄦ埛鍚嶅崌搴忔帓鍒�
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public List<SmUserVO> listUserUnInDeptOid(String deptOid,
- Map<String, String> queryMap) throws VciBaseException {
- if(StringUtils.isBlank(deptOid)){
- return new ArrayList<>();
- }
- return listUserByQueryField(QUERY_FIELD_DEPARTMENT,deptOid,queryMap,true);
- }
-
- /**
- * 鏌ヨ涓嶅湪鏌愪釜閮ㄩ棬涓嬬殑鐢ㄦ埛瀵硅薄鍒楄〃
- * @param deptOid 閮ㄩ棬鐨勪富閿�
- * @param queryMap 鏌ヨ鏉′欢锛屽鏋滄槸閮ㄩ棬鐨勬煇涓睘鎬т綔涓烘煡璇㈡潯浠讹紝鍒欏彲浠ヤ娇鐢╬kDepartment.xxx杩欐牱鐨勬柟寮�
- * @param pageHelper 鍒嗛〉鍜屾帓搴忎俊鎭紝榛樿浣跨敤鐢ㄦ埛鍚嶅崌搴忔帓鍒�
- * @return 鐢ㄦ埛鐨勬樉绀哄璞″垪琛紝榛樿浣跨敤鐢ㄦ埛鍚嶅崌搴忔帓鍒�
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<SmUserVO> gridUserUnInDeptOid(String deptOid,
- Map<String, String> queryMap, PageHelper pageHelper)
- throws VciBaseException {
- return gridUserByQueryField(QUERY_FIELD_DEPARTMENT,deptOid,queryMap,pageHelper,true);
- }
-
- /**
* 鏌ヨ鏌愪釜瑙掕壊涓嬬殑鐢ㄦ埛瀵硅薄
* @param roleOid 瑙掕壊鐨勪富閿�
* @param queryMap 鏌ヨ鏉′欢锛屽鏋滄槸瑙掕壊鐨勬煇涓睘鎬т綔涓烘煡璇㈡潯浠讹紝鍒欏彲浠ヤ娇鐢╬kRole.xxx杩欐牱鐨勬柟寮�
@@ -735,26 +788,7 @@
@Override
public List<SmUserVO> listUserByRoleOid(String roleOid,
Map<String, String> queryMap) throws VciBaseException {
- if(StringUtils.isBlank(roleOid)){
- return new ArrayList<>();
- }
- return listUserByQueryField(QUERY_FIELD_ROLE,roleOid,queryMap,false);
-
- }
-
- /**
- * 鏌ヨ鏌愪釜瑙掕壊涓嬬殑鐢ㄦ埛瀵硅薄鍒楄〃
- * @param roleOid 瑙掕壊鐨勪富閿�
- * @param queryMap 鏌ヨ鏉′欢锛屽鏋滄槸瑙掕壊鐨勬煇涓睘鎬т綔涓烘煡璇㈡潯浠讹紝鍒欏彲浠ヤ娇鐢╬kRole.xxx杩欐牱鐨勬柟寮�
- * @param pageHelper 鍒嗛〉鍜屾帓搴忎俊鎭紝榛樿浣跨敤鐢ㄦ埛鍚嶅崌搴忔帓鍒�
- * @return 鐢ㄦ埛鐨勬樉绀哄璞″垪琛紝榛樿浣跨敤鐢ㄦ埛鍚嶅崌搴忔帓鍒�
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<SmUserVO> gridUserByRoleOid(String roleOid,
- Map<String, String> queryMap, PageHelper pageHelper)
- throws VciBaseException {
- return gridUserByQueryField(QUERY_FIELD_ROLE,roleOid,queryMap,pageHelper,false);
+ return listUserVOByRoleOid(queryMap,roleOid,false);
}
/**
@@ -767,25 +801,54 @@
@Override
public List<SmUserVO> listUserUnInRoleOid(String roleOid,
Map<String, String> queryMap) throws VciBaseException {
- if(StringUtils.isBlank(roleOid)){
- return new ArrayList<>();
+ // TODO:鏍规嵁褰撳墠鐧诲綍鐨勭敤鎴峰喅瀹氳兘鏌ラ偅浜涚敤鎴�
+ String usertype = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUsertype();
+ //鏍规嵁褰撳墠鐧诲綍鐨勭敤鎴风被鍨嬩笉鍚岋紝鏌ヨ涓嶅悓鐨勭敤鎴�
+ if(UserTypeEnum.SUPPER_ADMIN.getValue().equals(usertype)){
+ //瓒呯鐢ㄦ埛鍙兘鏌ョ鐞嗗憳鐢ㄦ埛
+ queryMap.put("plusertype", "1");
+ }else{
+ //闄や簡瓒呯閮藉彧鑳芥煡鏅�氱敤鎴�
+ queryMap.put("plusertype", "2");
}
- return listUserByQueryField(QUERY_FIELD_ROLE,roleOid,queryMap,true);
+ return listUserVOByRoleOid(queryMap,roleOid,true);
}
- /**
- * 鏌ヨ涓嶅湪鏌愪釜瑙掕壊涓嬬殑鐢ㄦ埛瀵硅薄鍒楄〃
- * @param roleOid 瑙掕壊鐨勪富閿�
- * @param queryMap 鏌ヨ鏉′欢锛屽鏋滄槸瑙掕壊鐨勬煇涓睘鎬т綔涓烘煡璇㈡潯浠讹紝鍒欏彲浠ヤ娇鐢╬kRole.xxx杩欐牱鐨勬柟寮�
- * @param pageHelper 鍒嗛〉鍜屾帓搴忎俊鎭紝榛樿浣跨敤鐢ㄦ埛鍚嶅崌搴忔帓鍒�
- * @return 鐢ㄦ埛鐨勬樉绀哄璞″垪琛紝榛樿浣跨敤鐢ㄦ埛鍚嶅崌搴忔帓鍒�
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<SmUserVO> gridUserUnInRoleOid(String roleOid,
- Map<String, String> queryMap, PageHelper pageHelper)
- throws VciBaseException {
- return gridUserByQueryField(QUERY_FIELD_ROLE,roleOid,queryMap,pageHelper,true);
+ /**
+ * 鐢ㄦ埛鏍规嵁瑙掕壊鏌ヨ鐨勭粺涓�鏂规硶
+ * @param conditionMap 鏌ヨ鏉′欢
+ * @param roleOid 瑙掕壊涓婚敭
+ * @param notIn true涓嶅湪鑼冨洿鍐咃紝false鍐嶈寖鍥村唴
+ * @return
+ */
+ private List<SmUserVO> listUserVOByRoleOid(Map<String,String> conditionMap,String roleOid,boolean notIn){
+ //listUserByQueryField杩欎釜鏂规硶鏆傛椂涓嶈兘婊¤冻鎴戠幇鍦ㄧ殑鏌ヨ闇�姹傦紝骞朵笖寮曠敤鐨勫湴鏂硅緝澶氾紝鎵�浠ヤ笉澶ソ鏀瑰姩
+ //1銆佸厛鏌ヨ涓庡綋鍓嶈鑹插瓨鍦ㄥ叧鑱斿叧绯荤殑鐢ㄦ埛
+ String sql = "select pluseruid,plroleuid from pluserrole where plroleuid = '" + roleOid +"'";
+ List<BusinessObject> cbos = boService.queryBySql(sql, null);
+ List<String> userOidList = new ArrayList<>();
+ if(CollectionUtils.isEmpty(cbos)){
+ return new ArrayList<>();
+ }
+ //閬嶅巻鍑虹敤鎴蜂富閿�
+ cbos.stream().forEach(cbo->{
+ userOidList.add(ObjectTool.getNewBOAttributeValue(cbo,"pluseruid"));
+ });
+ //2銆佸啀鏌ヨ鐢ㄦ埛
+ VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(conditionMap, SmUserDO.class);
+ List<SmUserDO> smUserDOS = new ArrayList<>();
+ queryWrapperForDO.setLinkTableSql(" left join pluserdept up on " + queryWrapperForDO.getTableNick() + ".pluid = up.pluseruid" +
+ " left join pldept pkDepartment on up.pldeptuid = pkDepartment.pluid " +
+ " left join PLUSERPASSWORDSTRATEGY pkUserPassword on " +queryWrapperForDO.getTableNick() + ".pluid = pkUserPassword.pluseruid ");
+ WebUtil.switchCollectionForOracleIn(userOidList).stream().forEach(userOids->{
+ if(notIn){
+ queryWrapperForDO.notIn("pluid",WebUtil.toInSql(userOids.toArray(new String[0])));
+ }else{
+ queryWrapperForDO.in("pluid",WebUtil.toInSql(userOids.toArray(new String[0])));
+ }
+ smUserDOS.addAll(boService.selectByQueryWrapper(queryWrapperForDO, SmUserDO.class));
+ });
+ return smUserDO2VOs(smUserDOS);
}
/**
@@ -958,23 +1021,52 @@
/**
* 淇敼瀵嗙爜
* @param userOid 鐢ㄦ埛涓婚敭
+ * @param oldPassword 鏃х殑瀵嗙爜
* @param password 鏂扮殑瀵嗙爜
* @param confirmPassword 纭瀵嗙爜
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void changePassword(String userOid, String password,
- String confirmPassword) throws VciBaseException {
- WebUtil.alertNotNull(userOid,"鐢ㄦ埛涓婚敭",password,"瀵嗙爜",confirmPassword,"纭瀵嗙爜");
+ public boolean changePassword(String userOid,String oldPassword, String password,
+ String confirmPassword) throws Exception {
+ WebUtil.alertNotNull(userOid,"鐢ㄦ埛涓婚敭",oldPassword,"鐧诲綍瀵嗙爜",password,"瀵嗙爜",confirmPassword,"纭瀵嗙爜");
if(!password.equals(confirmPassword)){
throw new VciBaseException("瀵嗙爜鍜岀‘璁ゅ瘑鐮佷笉鐩哥瓑");
}
+ //瀵规棫瀵嗙爜鍜屽瘑鐮佽繘琛岃В瀵嗭紝渚夸簬姣斿瀵嗙爜鐢�
+ oldPassword = Func.decryptAes(oldPassword,"daliantan0v0vcip");
+ password = Func.decryptAes(password,"daliantan0v0vcip");
+ //瀵规瘮鏃у瘑鐮�
+ boolean b = this.checkPasswordEqual(oldPassword, userOid);
+ if(!b){
+ throw new PLException("500", new String[] { "鎮ㄨ緭鍏ョ殑瀵嗙爜涓庣櫥褰曞瘑鐮佷笉涓�鑷�,璇烽噸鏂拌緭鍏�!"});
+ }
+ SmUserVO smUserVO = getUserByUserOid(userOid);
+ if(Func.isEmpty(smUserVO)){
+ throw new VciBaseException("褰撳墠淇敼鐨勭敤鎴蜂笉瀛樺湪锛�");
+ }
+ //TODO:鏍￠獙瀵嗙爜鏄惁绗﹀悎绛栫暐
+ String error = platformClientUtil.getFrameworkService().checkPasswordStrategyByUserId(smUserVO.getId(), password,null);
+ if (!StringUtils.isBlank(error)) {
+ throw new VciBaseException("褰撳墠璁剧疆鐨勫瘑鐮侊紝瀵嗙爜绛栫暐鏍￠獙鏈�氳繃!");
+ }
+
+ //TODO:鑰冭檻鏄惁闇�瑕佸皢淇敼鏂瑰紡鏀规垚鐩存帴璋冪敤骞冲彴鐨勬帴鍙ｏ紝鍥犱负鐜板湪鐨勪慨鏀规柟寮忔病鑳芥纭殑鏇存柊缂撳瓨
+ /*UserInfo userInfo = new UserInfo();
+ userInfo.id = userOid.trim();
+ userInfo.pwd = password;
+ userInfo.pwdUpdateTime = System.currentTimeMillis();
+ boolean updateBoolean = platformClientUtil.getFrameworkService().updateUser(userInfo, new UserEntityInfo(WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId(), null));
+ return updateBoolean;*/
+
ThreeDES des = new ThreeDES();// 瀹炰緥鍖栦竴涓锟�?
des.getKey("daliantan0v0");// 鐢熸垚瀵嗗寵
String encPassword = des.getEncString(password);
- String sql = "update pluser set plpassword = '" + encPassword + "' where pluid = '" + userOid.trim() + "'";
+ //淇敼瀵嗙爜鐨勫悓鏃堕渶瑕佸皢瀵嗙爜淇敼鏃堕棿涔熸洿鏂�
+ String sql = "update pluser set plpassword = '" + encPassword + "', plpwdupdatetime = TO_DATE('"
+ + Func.format(new Date(),"yyyy-MM-dd HH:mm:ss") +"','yyyy-MM-dd hh24:mi:ss') where pluid = '" + userOid.trim() + "'";
try {
- platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
+ return platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1037,14 +1129,20 @@
smUserDTO.setPwdUpdateTime(date);
smUserDTO.setStatus((short) 0);
smUserDTO.setCreateTime(date);
- smUserDTO.setLastModifyTime(date);
- String loginUserName = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
- smUserDTO.setCreator(loginUserName);
- //smUserDTO.setCreator("developer");
- smUserDTO.setLastModifier(loginUserName);
- //smUserDTO.setLastModifier("developer");
+ SessionInfo loginUser = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
+ String loginUserId = loginUser.getUserId();
+ //鐢ㄦ埛绫诲瀷锛岀幇鍦ㄦ寜鐓у綋鍓嶇櫥褰曠殑鐢ㄦ埛鍐冲畾浠栨墍娣诲姞鐨勭敤鎴风骇鍒�
+ //瓒呯娣诲姞鐨勫氨鏄鐞嗗憳
+ if(UserTypeEnum.SUPPER_ADMIN.getValue().equals(loginUser.getUsertype())){
+ smUserDTO.setUserType(Short.parseShort(UserTypeEnum.ADMIN.getValue()));
+ }else {
+ //绠＄悊鍛樻坊鍔犵殑灏辨槸鏅�氱敤鎴�
+ smUserDTO.setUserType(Short.parseShort(UserTypeEnum.USER.getValue()));
+ }
+ smUserDTO.setCreator(loginUserId);
+ smUserDTO.setLastModifier(loginUserId);
UserInfo userInfo = changeSmUserDTOToUserInfo(smUserDTO);
- UserEntityInfo userEntityInfo = new UserEntityInfo(loginUserName, "");
+ UserEntityInfo userEntityInfo = new UserEntityInfo(loginUserId, "");
String oid = platformClientUtil.getFrameworkService().saveUser(userInfo, userEntityInfo);
if (Func.isEmpty(oid)) {
return false;
@@ -1052,7 +1150,6 @@
if(Func.isNotBlank(smUserDTO.getPkDepartment())){
//鎵ц淇濆瓨鐢ㄦ埛閮ㄩ棬鍏宠仈鍏崇郴
orgDeptQueryService.saveUsersDept(new String[]{oid},smUserDTO.getPkDepartment());
- //platformClientUtil.getFrameworkService().saveUserDept(new String[]{oid}, smUserDTO.getPkDepartment(), userEntityInfo);
}
return true;
}
@@ -1082,14 +1179,16 @@
if(Func.isEmpty(dbSmUserVO) || Func.isBlank(dbSmUserVO.getOid())){
throw new PLException("500", new String[] { "褰撳墠淇敼鐨勭敤鎴蜂笉瀛樺湪"});
}
-
- smUserDTO.setLastModifyTime(new Date());
- String loginUserName = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
+ SessionInfo loginUser = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
+ String loginUserName = loginUser.getUserId();
smUserDTO.setLastModifier(loginUserName);
+ smUserDTO.setUserType(Short.parseShort(dbSmUserVO.getUserType()));
+ smUserDTO.setPwdUpdateTime(dbSmUserVO.getLastModifyPasswordTime());
+ smUserDTO.setIsDeptLeader(smUserDTO.getIsDeptLeader().equals("涓嶆槸") ? "0":"1");
UserInfo userInfo = changeSmUserDTOToUserInfo(smUserDTO);
boolean updateBoolean = platformClientUtil.getFrameworkService().updateUser(userInfo, new UserEntityInfo(loginUserName, null));
//淇敼鎴愬姛锛屽苟涓旂敤鎴峰叧鑱旈儴闂ㄦ湁鎵�鏇存敼
- if(updateBoolean && Func.isNotEmpty(smUserDTO.getPkDepartment()) && !smUserDTO.getPkDepartment().equals(dbSmUserVO.getPkDepartment())){
+ if(updateBoolean && !smUserDTO.getPkDepartment().equals(dbSmUserVO.getPkDepartment())){
//鎵ц淇濆瓨鐢ㄦ埛閮ㄩ棬鍏宠仈鍏崇郴
orgDeptQueryService.saveUsersDept(new String[]{dbSmUserVO.getOid()},smUserDTO.getPkDepartment());
}
@@ -1143,10 +1242,8 @@
}
//鏍规嵁褰撳墠鍒涘缓杩欎釜鐢ㄦ埛鐨勪汉鎵�缁戝畾瀵嗙爜绛栫暐鏉ヨ繘琛屽瘑鐮佹牎楠�
try {
- //TODO:涓轰簡鏂逛究璋冭瘯锛屾墍浠ヨ繖鍎垮厛娉ㄩ噴鍐欐鍚庨潰璁板緱鏇存敼
- //String userName = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
- String userName = "developer";
- String error = platformClientUtil.getFrameworkService().checkPasswordStrategyByUserId(userName, smUserDTO.getPassword(),null);
+ String userId = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
+ String error = platformClientUtil.getFrameworkService().checkPasswordStrategyByUserId(userId, smUserDTO.getPassword(),null);
if (!StringUtils.isBlank(error)) {
throw new VciBaseException("褰撳墠璁剧疆鐨勫瘑鐮侊紝瀵嗙爜绛栫暐鏍￠獙鏈�氳繃");
}
@@ -1175,7 +1272,7 @@
userInfo.status = user.getStatus();
userInfo.createTime = user.getCreateTime().getTime();
userInfo.createUser = user.getCreator() == null ? "" : user.getCreator();
- userInfo.updateTime = user.getLastModifyTime().getTime();
+ userInfo.updateTime = System.currentTimeMillis();
userInfo.updateUser = user.getLastModifier() == null ? "" : user.getLastModifier();
userInfo.pwdUpdateTime = user.getPwdUpdateTime().getTime();
userInfo.grantor = user.getGrantor() == null ? "" : user.getGrantor();
@@ -1191,11 +1288,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean deleteUser(String[] ids) throws PLException {
- if(Func.isEmpty(ids)){
- throw new VciBaseException("寰呭垹闄ょ殑鐢ㄦ埛id鍒楄〃涓嶈兘涓虹┖锛�");
- }
+ VciBaseUtil.alertNotNull(ids,"瑕佸垹闄ょ殑鐢ㄦ埛涓婚敭");
//璋冪敤platformClientUtil鐨勫垹闄ょ敤鎴风殑鏂规硶锛屼細涓�璧峰垹闄ゆ帀鍏峰鍏宠仈鍏崇郴鐨勪竴浜涗俊鎭紝濡傞儴闂�
- return platformClientUtil.getFrameworkService().deleteUser(ids, null);
+ return platformClientUtil.getFrameworkService().deleteUser(
+ ids,
+ new UserEntityInfo(WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId(),null)
+ );
}
/**
@@ -1219,10 +1317,12 @@
*/
@Override
public String downloadImportTemplate(String downloadFileName) {
+ //鐣岄潰娌′紶鍚嶇О锛屼娇鐢ㄩ粯璁ゅ悕绉�
+ downloadFileName = Func.isBlank(downloadFileName) ? "鐢ㄦ埛瀵煎叆妯℃澘_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss"):downloadFileName;
// 璁剧疆琛ㄥ崟鍒楀悕
List<String> columns = new ArrayList<>(Arrays.asList("璐﹀彿", "瀵嗙爜", "濮撳悕", "鐢靛瓙閭", "涓撲笟", "鎻忚堪", "閮ㄩ棬(涓婁笅绾ч儴闂ㄤ箣闂翠互鍙嶆枩鏉犻殧寮�(/))"));
//鑾峰彇鏄惁瀵煎嚭瀵嗙骇閰嶇疆椤�
- String flag = ConfigReader.getConfigValue("exportSecretGrade");
+ String flag = ConfigCorbaReader.getConfigValue("exportSecretGrade");
if (flag != null && flag.equalsIgnoreCase("true")) {
columns = new ArrayList<>(Arrays.asList("璐﹀彿", "瀵嗙爜", "濮撳悕", "鐢靛瓙閭", "涓撲笟", "鎻忚堪", "閮ㄩ棬(涓婁笅绾ч儴闂ㄤ箣闂翠互鍙嶆枩鏉犻殧寮�(/))" ,"瀵嗙骇"));
}
@@ -1262,7 +1362,7 @@
* @throws VciBaseException
*/
@Override
- public BaseResult importUser(File file) throws VciBaseException {
+ public BaseResult importUser(File file) throws Exception {
VciBaseUtil.alertNotNull(file,"excel鏂囦欢");
if(!file.exists()){
throw new VciBaseException("瀵煎叆鐨別xcel鏂囦欢涓嶅瓨鍦�,{0}",new String[]{file.getPath()});
@@ -1271,11 +1371,10 @@
//1銆佽鍙杄xcel涓殑鏁版嵁锛岀粍鎴愬璞�
ReadExcelOption excelOption = new ReadExcelOption();
//褰撳墠鐧诲綍鐨勭敤鎴疯处鍙�
- //String loginUserId = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
- String loginUserId = "developer";
+ String loginUserId = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
UserEntityInfo userEntityInfo = new UserEntityInfo(loginUserId,null);
//鏄惁瀵煎叆瀵嗙骇閰嶇疆
- boolean exportSecretGrade = Boolean.parseBoolean(ConfigReader.getConfigValue("exportSecretGrade"));
+ boolean exportSecretGrade = Boolean.parseBoolean(ConfigCorbaReader.getConfigValue("exportSecretGrade"));
List<SmUserPO> poList = ExcelUtil.readDataObjectFromExcel(file, SmUserPO.class,excelOption,(value, po, fieldName)->{
Integer secretValue = UserSecretEnum.getSecretValueByText(po.getSecretGradeText());
//鏄惁蹇呴』瀵煎叆瀵嗙骇
@@ -1299,7 +1398,9 @@
//褰撳墠excel涓槸鍚﹂噸澶嶇敤鐨勫垽閲峂ap:锛坘ey锛氳处鍙凤紝value锛氳鍙凤級
Map<String, String> excelReapeat = new HashMap<>();
//鍏堣幏鍙栧叏閮ㄩ儴闂ㄥ悕绉扮殑鐖跺瓙瀵瑰簲鍏崇郴锛歬ey涓洪儴闂ㄥ瓙鐖剁骇鍚嶇О璺緞锛寁alue涓洪儴闂ㄤ俊鎭�
- Map<String,OrgDepartmentVO> deptVOMap = orgDeptQueryService.getDeptAllTreeMap();
+ List<OrgDepartmentVO> orgDepartmentVOList = orgDeptQueryService.getDeptAllFullName();
+ Map<String, OrgDepartmentVO> deptVOMap = orgDepartmentVOList.stream().collect(Collectors.toMap(OrgDepartmentVO::getFullDeptNamePath, s->s));
+ //Map<String,OrgDepartmentVO> deptVOMap = orgDeptQueryService.getDeptAllTreeMap();
//鍒ゆ柇蹇呭～灞炴�ф槸鍚︿负绌猴紝鐢ㄦ埛鏄惁宸插瓨鍦紝浠ュ強閮ㄩ棬鏄惁濉敊绛夋牎楠岄�昏緫
List<String> finalRepeatUserId = repeatUserId;
poList.stream().forEach(smUserPO -> {
@@ -1334,7 +1435,6 @@
smUserDTO.setPwdUpdateTime(date);
smUserDTO.setStatus((short) 0);
smUserDTO.setCreateTime(date);
- smUserDTO.setLastModifyTime(date);
smUserDTO.setCreator(loginUserId);
smUserDTO.setLastModifier(loginUserId);
//淇濆瓨鐢ㄦ埛
--
Gitblit v1.9.3