Skip to content

Commit f6ea638

Browse files
committed
better data type
1 parent 27a3098 commit f6ea638

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

dss-application/src/main/java/com/webank/wedatasphere/dss/application/entity/DSSUser.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ public class DSSUser {
2525
private String username;
2626
private String name;
2727
private Boolean isFirstLogin;
28-
//增加是否超级用户表示 0-不是超级用户 1-是超级用户
29-
private int isSuperUser = 0;
28+
private boolean isSuperUser = false;
3029

31-
public int getIsSuperUser() {
30+
public boolean getIsSuperUser() {
3231
return isSuperUser;
3332
}
34-
public void setIsSuperUser(int isSuperUser) {
33+
public void setIsSuperUser(boolean isSuperUser) {
3534
this.isSuperUser = isSuperUser;
3635
}
3736

dss-application/src/main/java/com/webank/wedatasphere/dss/application/restful/ApplicationRestfulApi.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,10 @@ public Response getBaseInfo(@Context HttpServletRequest req){
7575
DSSUser dssUser = dataworkisUserService.getUserByName(username);
7676
DSSUserVO dataworkisUserVO = new DSSUserVO();
7777
String superUserName = ApplicationConf.SUPER_USER_NAME;
78-
//是否超级用户登录
7978
if(username.equals(superUserName)){
80-
dssUser.setIsSuperUser(1);
79+
dssUser.setIsSuperUser(true);
8180
}else{
82-
dssUser.setIsSuperUser(0);
81+
dssUser.setIsSuperUser(false);
8382
}
8483

8584
dataworkisUserVO.setBasic(dssUser);

web/src/js/module/header/userMenu.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@
1717
</template>
1818
<script>
1919
import api from '@/js/service/api';
20-
import storage from '@/js/helper/storage';
2120
export default {
2221
name: 'Menu',
2322
props: {
24-
isSuperUser: Number
23+
isSuperUser: Boolean
2524
},
2625
data() {
2726
return {
@@ -48,7 +47,7 @@ export default {
4847
},
4948
watch: {
5049
isSuperUser: function(newVal){
51-
if(newVal === 1){
50+
if(newVal){
5251
if(this.menuList[0].id !== 'user-management'){
5352
this.menuList.unshift({
5453
id: 'user-management',

0 commit comments

Comments
 (0)