Merge remote-tracking branch 'origin/master'

许鹏程

2023-05-24 5839384228e2f10d880d23c7a1c99ba86430634c

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	product-server-admin/src/main/java/com/product/admin/service/RouterService.java

 pom.xml

@@ -18,6 +18,8 @@
        <module>product-server-admin</module>
        <module>product-server-org-admin</module>
        <module>home-server-admin</module>
        <module>product-server-core</module>
        <module>product-server-administrator</module>
    </modules>
    <properties>
        <skipTests>true</skipTests>
@@ -766,5 +768,10 @@
            <groupId>io.jsonwebtoken</groupId>
            <artifactId>jjwt</artifactId>
        </dependency>
        <dependency>
            <groupId>org.fusesource</groupId>
            <artifactId>sigar</artifactId>
            <version>1.6.4</version>
        </dependency>
    </dependencies>
</project>

 product-server-admin/src/main/java/com/product/admin/service/LoginInitParameterService.java

@@ -104,7 +104,8 @@
        if (user.getCurrentDept() != null) {
            ui.put("dept_name", user.getCurrentDept().getString("org_level_name"));
            ui.put("dept_uuid", user.getCurrentDept().getString("uuid"));
            ui.put("dept_all_name", user.getCurrentDept().getString("org_level_all"));
            String dept_all=user.getCurrentDept().getString("org_level_all");
            ui.put("dept_all_name", dept_all.substring(dept_all.indexOf(user.getOrg_level_name())));
            ui.put("dept_code", user.getCurrentDept().getString("org_level_code"));
        }
        ui.put("user_signature", RedisUtil.get(userOperaService.USER_SIGNATURE_KEY + user.getUser_id()));

 product-server-admin/src/main/java/com/product/admin/service/PersonalCenterService.java

@@ -98,7 +98,7 @@
        StringBuilder sql = new StringBuilder();
        SystemUser currentUser = SpringMVCContextHolder.getCurrentUser();
        if (!currentUser.isManager()) {
            sql.append("\n SELECT b.user_phone_number,b.user_primary_email,b.user_name,a.sex,b.user_id,b.user_signature,b.thumbnail_img,c.job_post_name,d.org_level_name dept_name,d.uuid dept_uuid,d.org_level_uuid,d.org_level_all ,e.org_level_name company_name FROM  product_sys_staffs a  ");
            sql.append("\n SELECT b.gender, b.user_phone_number,b.user_primary_email,b.user_name,a.sex,b.user_id,b.user_signature,b.thumbnail_img,c.job_post_name,d.org_level_name dept_name,d.uuid dept_uuid,d.org_level_uuid,d.org_level_all ,e.org_level_name company_name FROM  product_sys_staffs a  ");
            sql.append("\n join product_sys_users b on a.user_id=b.user_id and a.user_id=? ");
            sql.append("\n join product_sys_job_posts c on a.job_post_uuid=c.uuid ");
            sql.append("\n join product_sys_org_levels d on d.uuid=a.dept_uuid ");

 product-server-admin/src/main/java/com/product/admin/service/RouterService.java

@@ -124,7 +124,7 @@
        sql.append(" page_name title, ");
        sql.append(" d.button_icon icon, ");
        sql.append(" page_type, ");
        sql.append(" c.face_uuid,c.face_number ");
        sql.append(" c.face_uuid,c.face_number, ");
        sql.append(" d.uuid button_uuid, ");
        sql.append(" d.button_name, ");
        sql.append(" d.client_type_uuid ");

 product-server-admin/src/main/java/com/product/admin/service/SystemFaceService.java

 product-server-admin/src/main/java/com/product/admin/service/SystemMenusService.java

@@ -72,15 +72,23 @@
        }
    }

    /**
     * 初始化菜单缓存
     */

    public void initSystemMenu() {
        initSystemMenu(null, null);
    }

    /**
     * 初始化菜单缓存单条数据
     */
    public void refreshMenu(String uuid) {
        initSystemMenu(null, new String[]{uuid});
    }

    /**
     * 初始化菜单缓存整体
     */
    public void refreshMenu() {
        initSystemMenu();
    }

    public synchronized void refreshMenuByRole(String uuid) {
@@ -92,9 +100,6 @@
        initSystemMenu(uuid, null);
    }

    public void refreshMenu() {
        initSystemMenu();
    }

    /**
     * 初始化菜单缓存