Merge branch '20220927' into huacheng_test

zhaozhengjie

2022-09-28 56d8f32a676912435684e4b4b462e3e899bbd1f6

Merge branch '20220927' into huacheng_test

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -244,6 +244,8 @@

    private Long bindingCheckUnitId;

    private Integer backstageType;


    public String retrieveRelationName() {
        return this.type == 3 ? relationName : name;

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -782,6 +782,17 @@
        }else if (isNull(loginUserInfoVO.getLevel())){
            loginUserInfoVO.setLevel(1);
        }
        loginUserInfoVO.setBackstageType(1);
        String[] account={"dongqu","xiqu","yanbian","miyi","renhe"};
        if("zuzhibu".equals(sysUserDO.getAccount())){
            loginUserInfoVO.setBackstageType(2);
        }
        if(ArrayUtil.contains(account,sysUserDO.getAccount())){
            loginUserInfoVO.setBackstageType(3);
        }
        if(sysUserDO.getBindingCheckUnitId()!=null){
            loginUserInfoVO.setBackstageType(4);
        }
        return R.ok(loginUserInfoVO);
    }