bug修复

mitao

2024-05-24 5dbf595f74ad662dd877cc8a6f140fdc61c3a1b5

bug修复

 meiya-admin/src/main/java/com/sinata/modular/mall/controller/MallOrderController.java

@@ -396,11 +396,11 @@
                            Collectors.toList());
            if (cityRoleList.contains(EnumCityRole.CITY_ROLE.index)) {
                // 市级城市管理员
                wrapper.like("o.city_code", shiroUser.getCityCode().substring(0, 4), SqlLike.RIGHT);
                wrapper.like("user2.agent_county_code", shiroUser.getCityCode().substring(0, 4), SqlLike.RIGHT);
            }
            else if (cityRoleList.contains(EnumCityRole.PROVINCE_ROLE.index)) {
                // 省级城市管理员
                wrapper.like("o.city_code", shiroUser.getCityCode().substring(0, 2), SqlLike.RIGHT);
                wrapper.like("user2.agent_county_code", shiroUser.getCityCode().substring(0, 2), SqlLike.RIGHT);
            }
        } catch (Exception e) {
            e.printStackTrace();

 meiya-admin/src/main/java/com/sinata/modular/mall/dao/mapping/MallOrderMapper.xml

@@ -67,6 +67,7 @@
        user2.nick_name as sale_nick_name,
        user2.real_name as sale_user_name,
        user2.show_id as sale_show_id,
        user2.agent_county_code,
        (select count(1) from mall_order_detail_use where order_no = o.order_no) useNum
        FROM mall_order o
        LEFT JOIN mem_user u ON o.user_id = u.id

 meiya-admin/src/main/java/com/sinata/modular/member/controller/MemUserSalesController.java

@@ -149,11 +149,11 @@
                            Collectors.toList());
            if (cityRoleList.contains(EnumCityRole.CITY_ROLE.index)) {
                // 市级城市管理员
                wrapper.like("o.city_code", shiroUser.getCityCode().substring(0, 4), SqlLike.RIGHT);
                wrapper.like("o.agent_county_code", shiroUser.getCityCode().substring(0, 4), SqlLike.RIGHT);
            }
            else if (cityRoleList.contains(EnumCityRole.PROVINCE_ROLE.index)) {
                // 省级城市管理员
                wrapper.like("o.city_code", shiroUser.getCityCode().substring(0, 2), SqlLike.RIGHT);
                wrapper.like("o.agent_county_code", shiroUser.getCityCode().substring(0, 2), SqlLike.RIGHT);
            }
        } catch (Exception e) {
            e.printStackTrace();

 meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java

@@ -369,6 +369,7 @@
        vo.setIdCard(user.getIdCard());
        vo.setImAccount(user.getImAccount());
        vo.setImPassword(user.getImPassword());
        vo.setIsLeaveOffice(user.getIsLeaveOffice());
        //在职
        boolean condition1 = user.getIsLeaveOffice() == 0 && user.getAuditState() == 1;
        //已提交申请

 meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/common/vo/RegisterVo.java

@@ -106,6 +106,10 @@
    @ApiModelProperty(value = "审核状态，0待，1通过，2拒绝")
    private Integer auditState;

    @ApiModelProperty(value = "是否离职，-1未申请，0在职，1离职")
    private Integer isLeaveOffice;

    @ApiModelProperty(value = "是否可以修改个人资料")
    private Boolean modifyUserInfo = Boolean.TRUE;

}