From 90b486ba54098be293a256d9313d201a3bd5221f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 18 十月 2023 21:31:02 +0800
Subject: [PATCH] 1、编码规则增加显示所有者列，高级查询中增加所有者； 2、用户管理界面添加停用启用按钮。
---
Source/UBCS-WEB/src/views/code/code.vue | 13 +++
Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/vo/UserVO.java | 4
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java | 3
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MdmCountConfigController.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java | 5 +
Source/UBCS-WEB/src/views/system/user.vue | 94 +++++++++++++++++------
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MdmCountConfigServiceImpl.java | 14 ++-
Source/UBCS-WEB/src/const/code/mdmrule.js | 5 +
Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/entity/User.java | 2
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java | 6
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java | 7 +
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMdmCountConfigService.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 21 ++++
Source/UBCS-WEB/src/api/system/dept.js | 8 --
14 files changed, 133 insertions(+), 53 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/system/dept.js b/Source/UBCS-WEB/src/api/system/dept.js
index 8e594f5..e1e56b7 100644
--- a/Source/UBCS-WEB/src/api/system/dept.js
+++ b/Source/UBCS-WEB/src/api/system/dept.js
@@ -80,11 +80,3 @@
}
})
}
-
-export const updateUserStatus = (params) => {
- return request({
- url: '/api/ubcs-user/updateUserStatus',
- method: 'post',
- data: params
- })
-}
diff --git a/Source/UBCS-WEB/src/const/code/mdmrule.js b/Source/UBCS-WEB/src/const/code/mdmrule.js
index c8a5ce4..7992a0a 100644
--- a/Source/UBCS-WEB/src/const/code/mdmrule.js
+++ b/Source/UBCS-WEB/src/const/code/mdmrule.js
@@ -89,5 +89,10 @@
// searchSpan: 5,
display: false,
},
+ {
+ label: "鎵�鏈夎��",
+ prop: "ownerText",
+ display: false,
+ },
]
}
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index f26f0cc..3286013 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1647,6 +1647,7 @@
if (JSON.stringify(conditionMaps) != "{}") {
if (this.advancedQueryParam.currentOpen == "codeRule") {
this.query = conditionMaps;
+ // console.log(this.query);
this.onLoad(this.page);
} else {
this.sendGridCodeBasicSec(conditionMaps, true);
@@ -2303,6 +2304,12 @@
queryField: "lcStatus",
comboxKey: "codeSearchLCStatus",
},
+ {
+ data: [],
+ title: "鎵�鏈夎��",
+ fieldType: "text",
+ queryField: "ownerText",
+ },
];
} else {
this.advancedQueryParam.options = [
@@ -2592,7 +2599,11 @@
},
onLoad(page, params = {}) {
this.loading = true;
- gridCodeRule(page.currentPage, page.pageSize, params).then((res) => {
+ gridCodeRule(
+ page.currentPage,
+ page.pageSize,
+ Object.assign({},params,this.query),
+ ).then((res) => {
//console.log(res.data);
const data = res.data.data;
this.page.total = data.total;
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 2320aff..9b3f3a2 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -64,25 +64,31 @@
閰嶇疆瀵嗙爜绛栫暐
</el-button>
<el-button v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-coordinate"
- plain
- size="small"
- type="info"
- @click="handleLock">璐﹀彿瑙ｅ皝
+ icon="el-icon-coordinate"
+ plain
+ size="small"
+ type="info"
+ @click="handleLock">璐﹀彿瑙ｅ皝
</el-button>
<el-button v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-upload2"
- plain
- size="small"
- type="success"
- @click="handleImport">瀵煎叆
+ icon="el-icon-upload2"
+ plain
+ size="small"
+ type="success"
+ @click="handleImport">瀵煎叆
</el-button>
<el-button v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-download"
- plain
- size="small"
- type="warning"
- @click="handleExport">瀵煎嚭
+ icon="el-icon-download"
+ plain
+ size="small"
+ type="warning"
+ @click="handleExport">瀵煎嚭
+ </el-button>
+ <el-button size="small"
+ type="warning"
+ icon="el-icon-setting"
+ @click="updateUserStatus">
+ 璐﹀彿鍋�/鍚敤
</el-button>
</template>
<template slot="tenantName"
@@ -116,7 +122,6 @@
node-key="id"
show-checkbox>
</el-tree>
-
<span slot="footer" class="dialog-footer">
<el-button @click="roleBox = false">鍙� 娑�</el-button>
<el-button type="primary"
@@ -137,7 +142,6 @@
</el-dialog>
<!-- 璁剧疆瀵嗙爜绛栫暐寮瑰嚭妗�-->
<el-dialog
- :before-close="handleClose"
:visible.sync="passVisible"
class="passdialog"
append-to-body
@@ -174,10 +178,12 @@
updatePlatform,
add,
grant,
- resetPassword, unlock
+ resetPassword,
+ unlock,
+ updateUserStatus
} from "@/api/system/user";
import {exportBlob} from "@/api/common";
-import {getDeptTree, getDeptLazyTree, updateUserStatus} from "@/api/system/dept";
+import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
import {getRoleTree} from "@/api/system/role";
import {getPostList} from "@/api/system/post";
import {mapGetters} from "vuex";
@@ -347,6 +353,16 @@
message: "璇烽�夋嫨鐢ㄦ埛骞冲彴",
trigger: "blur"
}],
+ },
+ {
+ label: "鐘舵��",
+ display: false,
+ sortable:true,
+ html:true,
+ prop: "userStatus",
+ formatter : function (row, column) {
+ return row.userStatus == 0 ? '<i class="el-icon-check" style="color: #32cd32;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: #ff0000;font-size: 20px;font-weight: 800"></i>'
+ }
},
],
group: [
@@ -742,9 +758,6 @@
}
},
created() {
- updateUserStatus({userid:'1702600796324032513',status:true}).then(res=>{
- console.log(res)
- })
this.selecload()
const arr=JSON.parse(localStorage.getItem("updataid"))
if(arr.user_id != '0' && arr.tenant_id !== '000000'){
@@ -756,11 +769,40 @@
}
},
methods: {
- beOpen(done,type){
- console.log(done,type)
+
+ // beOpen(done,type){
+ // console.log(done,type)
+ // },
+ // 鐢ㄦ埛鍋滅敤鍚敤鐘舵��
+ /** 淇敼鐢ㄦ埛鐘舵�� */
+ updateUserStatus(){
+ let list = this.selectionList;
+ if(func.isEmpty(list)){
+ this.$message({
+ type: "warning",
+ message: "璇疯嚦灏戦�夋嫨涓�鏉＄敤鎴锋暟鎹紒"
+ });
+ return;
+ }
+ if(func.isAttrInconsistent(list,"userStatus")){
+ this.$message({
+ type: "warning",
+ message: "鎵归噺鎿嶄綔鐢ㄦ埛鐘舵�佹椂锛岃閫夋嫨鐢ㄦ埛鐘舵�佷竴鑷寸殑鏁版嵁锛�"
+ });
+ return;
+ }
+ let userIds = func.joinedString(list,"id");
+ let status = list[0].userStatus == 1 ? true:false;
+ updateUserStatus(userIds,status).then(res=>{
+ this.$message({
+ type: "success",
+ message: "鎿嶄綔鎴愬姛!"
+ });
+ this.onLoad(this.page);
+ })
},
//esc鍙栨秷閿搷浣�
- handleClose(done) {
+ /*handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
.then(() => {
done();
@@ -769,7 +811,7 @@
done();
});
- },
+ },*/
//鐐瑰嚮閰嶇疆瀵嗙爜绛栫暐
handlepass(){
if (this.selectionList.length === 0) {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
index abccfd4..da6fbfe 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
@@ -71,4 +71,9 @@
*/
private String basicSecTypes;
+ /**
+ * 鎵�鏈夎�呭湪鐣岄潰鏄剧ず鍐呭锛堣处鍙凤紙鐢ㄦ埛鍚嶏級锛�
+ */
+ private String ownerText;
+
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/entity/User.java b/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/entity/User.java
index 7a1e4e8..1dcba8b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/entity/User.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/entity/User.java
@@ -115,7 +115,7 @@
*/
private Long strategyUpdateStatus;
- /***
+ /**
* 璐﹀彿鏄惁鍋滅敤 0涓哄惎鐢紝1涓哄仠鐢�
*/
private Integer userStatus;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/vo/UserVO.java b/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/vo/UserVO.java
index 6eb8f0d..5e2b2b1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/vo/UserVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/vo/UserVO.java
@@ -86,12 +86,14 @@
* 鎷撳睍淇℃伅
*/
private String userExt;
+
/***
* 璐﹀彿鏄惁鍋滅敤 0涓哄惎鐢紝1涓哄惎鐢�
*/
private Integer userStatus;
+
/***
* 璐﹀彿鏄惁鍋滅敤 0涓哄惎鐢紝1涓哄惎鐢�
*/
- private String userStatus_text;
+ private String userStatusText;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index c536fa6..b79da09 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -50,6 +50,10 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.WebUtil;
import com.vci.ubcs.system.cache.NacosConfigCache;
+import com.vci.ubcs.system.entity.Strategy;
+import com.vci.ubcs.system.feign.ISysClient;
+import com.vci.ubcs.system.user.entity.User;
+import com.vci.ubcs.system.user.feign.IUserClient;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
@@ -117,6 +121,12 @@
private ICodeFixedValueService codeFixedValueService;
/**
+ * 绯荤粺鏈嶅姟
+ */
+ @Resource
+ private IUserClient userClient;
+
+ /**
* 鍒嗛〉鏌ヨ
* @param query
* @param conidtionMap
@@ -125,12 +135,12 @@
@Override
public IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> conidtionMap) throws VciBaseException {
//濡傛灉绛変簬鑷繁閰嶇疆鐨勭鐞嗙粍绉熸埛id鍜岀鐞嗙粍瓒呯璐﹀彿锛屽氨涓嶉渶瑕佹寜鐓ц鍒欐墍鏈夎�呮潵杩涜鏌ヨ
- if(!(AuthUtil.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId())
+ /*if(!(AuthUtil.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId())
&& AuthUtil.getUserId().toString().equals(NacosConfigCache.getAdminUserInfo().getUserId().toString()))
){
// 鎸夌収瑙勫垯鎵�鏈夎�呮潵鏌ヨ
conidtionMap.put("owner",AuthUtil.getUserId().toString());
- }
+ }*/
IPage<CodeRule> codeRuleIPage = this.codeRuleMapper.selectPage(Condition.getPage(query), UBCSCondition.getQueryWrapper(conidtionMap, CodeRule.class));
//do杞瑅o鍚屾椂setLcStatusText鐢熷懡鍛ㄦ湡鍊硷紝骞跺寘瑁呮垚鍒嗛〉瀵硅薄杩斿洖
return CodeRuleWrapper.build().pageVO(codeRuleIPage);
@@ -155,6 +165,7 @@
DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRule, MdmBtmTypeConstant.CODE_RULE);
codeRule.setLctid(CODE_RULE_LC);
codeRule.setLcStatus(FRAMEWORK_RELEASE_EDITING);
+ codeRule.setOwnerText(AuthUtil.getUserAccount()+"("+AuthUtil.getNickName()+")");
return R.status(codeRuleMapper.insert(codeRule)>0);
}
@@ -220,6 +231,12 @@
revisionModelUtil.copyFromDTOIgnore(codeRuleDTO, codeRule);
if(!codeRule.getOwner().equals(codeRuleDTO.getOwner())){
codeRule.setOwner(codeRuleDTO.getOwner());
+ R<User> userR = userClient.userInfoById(Func.toLong(codeRuleDTO.getOwner()));
+ if(!userR.isSuccess() || Func.isEmpty(userR.getData())){
+ codeRule.setOwnerText(codeRuleDTO.getOwner());
+ }else{
+ codeRule.setOwnerText(userR.getData().getAccount()+"("+userR.getData().getRealName()+")");
+ }
}
DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeRule);
return R.status(codeRuleMapper.updateById(codeRule)>0);
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MdmCountConfigController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MdmCountConfigController.java
index 96343a0..2dc3585 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MdmCountConfigController.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MdmCountConfigController.java
@@ -28,7 +28,7 @@
@PostMapping("/save")
public R saveConfig(@RequestBody MdmCountConfigVO mdmCountConfigVO){
- return R.status(countConfigService.saveMdmCountConfig(mdmCountConfigVO));
+ return countConfigService.saveMdmCountConfig(mdmCountConfigVO);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMdmCountConfigService.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMdmCountConfigService.java
index 1127034..a29bdcf 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMdmCountConfigService.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMdmCountConfigService.java
@@ -17,7 +17,7 @@
* @param mdmCountConfigVO
* @return
*/
- boolean saveMdmCountConfig(MdmCountConfigVO mdmCountConfigVO);
+ R saveMdmCountConfig(MdmCountConfigVO mdmCountConfigVO);
/**
* 鑾峰彇褰撳墠鐢ㄦ埛鏈夐偅浜涗富鏁版嵁缁熻閰嶇疆鍦ㄩ椤�
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MdmCountConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MdmCountConfigServiceImpl.java
index c24d37f..3ebe012 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MdmCountConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MdmCountConfigServiceImpl.java
@@ -9,6 +9,7 @@
import com.vci.ubcs.system.vo.MdmCountConfigVO;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.stereotype.Service;
@@ -31,14 +32,17 @@
* @return
*/
@Override
- public boolean saveMdmCountConfig(MdmCountConfigVO mdmCountConfigVO) throws ServiceException{
+ public R saveMdmCountConfig(MdmCountConfigVO mdmCountConfigVO) throws ServiceException{
if(Func.isEmpty(mdmCountConfigVO) || Func.isBlank(mdmCountConfigVO.getUserId().toString())){
throw new ServiceException("涓绘暟鎹粺璁￠厤缃繚瀛樻椂缂哄皯蹇呭～鍙傛暟!");
}
- boolean res = false;
- if (mdmCountConfigVO.getMdmNameList().isEmpty()) {
- return true;
+ if(mdmCountConfigVO.getMdmNameList().isEmpty()) {
+ return R.status(false);
}
+ if(mdmCountConfigVO.getMdmNameList().size() > 7){
+ return R.fail("鏄剧ず鐨勪富鏁版嵁閰嶇疆椤规渶澶氫负8椤�");
+ }
+ boolean res = false;
try {
String mdmNames = mdmCountConfigVO.getMdmNameList().stream().collect(Collectors.joining(","));
MdmCountConfig mdmCountConfigDB = getMdmCountConfig(mdmCountConfigVO.getUserId().toString());
@@ -55,7 +59,7 @@
}catch (Exception e){
throw new ServiceException("閰嶇疆淇濆瓨澶辫触,鍘熷洜锛�"+e.getCause());
}
- return res;
+ return R.status(res);
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
index 5c10d71..6c6c537 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
@@ -377,18 +377,19 @@
}
/**
- * 鑾峰彇鍒版寚瀹氳韩浠芥潈闄愮殑鐢ㄦ埛鍒楄〃
+ * 淇敼鐢ㄦ埛鐘舵�� 鍋滅敤/鍚敤
* @param userIds userId闆嗗悎
- * @param status 鍋滅敤/鍚敤 true锛氬惎鐢�,false:鍋滅敤
+ * @param status 鍋滅敤/鍚敤; true:鍚敤,false:鍋滅敤
* @return
*/
@PostMapping("/updateUserStatus")
@ApiOperationSupport(order = 21)
@ApiOperation(value = "鑾峰彇鍒版寚瀹氳韩浠芥潈闄愮殑鐢ㄦ埛鍒楄〃", notes = "浼犲叆userId闆嗗悎")
- public R<Boolean> updateUserStatus(String userIds,boolean status){
+ public R<Boolean> updateUserStatus(@Valid @RequestParam("userIds") String userIds,boolean status){
if (StringUtil.isBlank(userIds)) {
return R.fail("璇疯嚦灏戦�夋嫨涓�涓敤鎴�");
}
return R.status(userService.updateUserStatus(userIds,status));
}
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
index 28b0663..b22d722 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
@@ -581,11 +581,11 @@
*/
@Override
public boolean updateUserStatus(String userIds, boolean status) {
- Integer user_status=0;
+ Integer userStatus = 0;
if(!status){
- user_status=1;
+ userStatus = 1;
}
- return this.update(Wrappers.<User>lambdaUpdate().in(User::getId, Func.toLongList(userIds)).set(User::getUserStatus,user_status));
+ return this.update(Wrappers.<User>lambdaUpdate().in(User::getId, Func.toLongList(userIds)).set(User::getUserStatus,userStatus));
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java
index 20eaee3..69697f8 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java
@@ -54,7 +54,8 @@
userVO.setSexName(DictCache.getValue(DictEnum.SEX, user.getSex()));
userVO.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
userVO.setUserStatus(user.getUserStatus());
- userVO.setUserStatus_text(DictCache.getValue(DictEnum.USER_STATUS,user.getUserStatus()));//鐢ㄦ埛鐘舵��
+ userVO.setUserStatusText(DictCache.getValue(DictEnum.USER_STATUS,user.getUserStatus()));//鐢ㄦ埛鐘舵��
return userVO;
}
+
}
--
Gitblit v1.9.3