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

lidongdong

2022-11-25 01b70437d4ef3348e69b2af0dcbd7250e1234117

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

 flower_city/src/main/java/com/dg/core/controller/GuideDoController.java

@@ -210,7 +210,10 @@
            if (config.getMoreDepartmentIds()!=null&&config.getMoreDepartmentIds().indexOf(",")>0)
                config.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1));
            else
            {
                config.setDataPermission("0");
            }

             config.setRoleIds("13");
        }
        else

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -59,7 +59,7 @@
            List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("",account,"");
            HuaChengSysUser huaChengSysUser=null;

            if(list!=null || list.size()>0 )
            if(list!=null && list.size()>0 )
            {
                huaChengSysUser=list.get(0);
            }

 flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java

@@ -81,7 +81,7 @@
     * 导办数量
     */
    @ApiModelProperty("导办数量")
    private Integer transactionNum=0;
    private Integer transactionNum;

    /**
     * 浏览数量

 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -378,7 +378,10 @@
        //删除进展记录
        guideEvolveMapper.delete(new QueryWrapper<GuideEvolveEntity>().lambda().eq(GuideEvolveEntity::getGuideId, Id));
        TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrderDelete.getMatterId()));
        if (transactionEvent.getTransactionNum()>0)
        {
        transactionEvent.setTransactionNum(transactionEvent.getTransactionNum() - 1);
        }
        //对应办事指南减一
        transactionEventMapper.updateById(transactionEvent);
        SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrderDelete.getGuideUserId()));

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -156,11 +156,12 @@
                AND user_type=#{userType}
            </if>
            <if test="ids != null">
                and department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                AND
                <foreach collection="ids" item="param"  open="(" close=")" separator="or">
                     locate(#{param},more_department_ids)>0
                </foreach>
            </if>

            <if test="isDivisionHead != null and isDivisionHead != ''">
                and is_division_head=#{isDivisionHead}
            </if>