Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev

Mr.Shi

2023-09-04 c7c49be8b15e6355dc19e8705dc7bc2de603e398

 server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java

@@ -74,6 +74,8 @@
        SystemRole queryDto = new SystemRole();
        queryDto.setCode(systemRole.getCode());
        queryDto.setDeleted(Boolean.FALSE);
        queryDto.setCompanyId(systemRole.getCompanyId());
        queryDto.setType(systemRole.getType());
        if(Constants.equalsInteger(user.getType(),Constants.USERTYPE.COM)){
            systemRole.setType(Constants.ROLETYPE.com);
            queryDto.setCompanyId(systemRole.getCompanyId());