Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test

liyj

2024-10-12 08bae4808c1cc00ab4ef1bf5254b3d712228be4d

Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test

 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridUserRoleDTO.java

@@ -33,4 +33,7 @@
     */
    private String roleName;


    private boolean lastOrgRole;

}

 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgVo.java

@@ -13,6 +13,8 @@
     * name
     */
    private String name;
    private String systemCode;

    private long current;
    private long size;
    private boolean needCount;

 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java

@@ -119,7 +119,7 @@
        requestVo.setBodyVo(gridRoleMenuVo);
        try {
//            log.info("xsdobject:{}",JSON.toJSONString(requestVo));
            log.info("xsdurl:{}",gridUrl + "/sys/getOrgRole");
            log.info("xsdurl:{}",gridUrl + "/sys/getUserMenuRecur");
//            log.info("xsdurl:{}",testUrl + "/sys/getUserByToken");
            s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getUserMenuRecur", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
            log.info("xsd:{}",s);